From b23f90b10a8da86e320bf5a1111b3d566c64c2a8 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Wed, 7 May 2014 21:43:17 -0400 Subject: [PATCH] Feed and Facehug no longer use a menu and instead pick a random target in range. --- code/WorkInProgress/ZomgPonies/mobs/metroid/powers.dm | 2 +- code/modules/mob/living/carbon/alien/special/facehugger.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/WorkInProgress/ZomgPonies/mobs/metroid/powers.dm b/code/WorkInProgress/ZomgPonies/mobs/metroid/powers.dm index 6c32146a234..cb123bb4323 100644 --- a/code/WorkInProgress/ZomgPonies/mobs/metroid/powers.dm +++ b/code/WorkInProgress/ZomgPonies/mobs/metroid/powers.dm @@ -14,7 +14,7 @@ if(C!=src && !istype(C,/mob/living/carbon/slime) && Adjacent(C)) choices += C - var/mob/living/carbon/M = input(src,"Who do you wish to feed on?") in null|choices + var/mob/living/carbon/M = pick(choices) if(!M) return if(Adjacent(M)) diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 641f9f53129..92d07c19652 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -124,10 +124,10 @@ var/const/MAX_ACTIVE_TIME = 400 var/list/choices = list() for(var/mob/living/L in view(1,src)) - if(L.stat != 2 && src.Adjacent(L)) + if(L.stat != 2 && !istype(L,/mob/living/carbon/alien) && src.Adjacent(L)) choices += L - var/mob/living/M = input(src,"Who do you wish to infest?") in null|choices + var/mob/living/M = pick(choices) if(!M || !src) return