From 31655a8f560dfbe173a9774b588e7eb50c80bc3d Mon Sep 17 00:00:00 2001 From: "giacomand@gmail.com" Date: Fri, 5 Oct 2012 16:52:32 +0000 Subject: [PATCH] -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 --- .../mob/living/carbon/alien/humanoid/caste/drone.dm | 9 +++++++-- .../mob/living/carbon/alien/special/facehugger.dm | 5 ++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm index 16773b53eef..031ef4f9b5e 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm +++ b/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)) diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 1a2efc69499..830784170cd 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/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()