From b3dad9dae834bb1f707ae8526863ba20523bc3f8 Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Sun, 10 Jul 2016 02:44:00 +0100 Subject: [PATCH 1/2] Fixes Unstable REMOTE_VIEW Bug - Players with PSY_RESISTANCE are no longer viable targets for REMOTE_VIEW --- code/game/dna/genes/vg_powers.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm index b4940314e98..2f6b54ac201 100644 --- a/code/game/dna/genes/vg_powers.dm +++ b/code/game/dna/genes/vg_powers.dm @@ -242,6 +242,8 @@ var/list/targets = living_mob_list var/list/remoteviewers = new /list() for(var/mob/M in targets) + if(PSY_RESIST in M.mutations) + continue if(REMOTE_VIEW in M.mutations) remoteviewers += M if(!remoteviewers.len || remoteviewers.len == 1) @@ -273,10 +275,6 @@ return for(var/mob/living/L in targets) - if(ishuman(L)) - var/mob/living/carbon/human/H = L - if(PSY_RESIST in H.mutations) - continue target = L if(target) From 1bd63b62d2c96ea1de63f6117b62b54a7381c1ae Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Mon, 11 Jul 2016 20:01:30 +0100 Subject: [PATCH 2/2] Target list no longer uses living_mob_list It's now, instead, just a regular list. --- code/game/dna/genes/vg_powers.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm index 2f6b54ac201..7ed7f3fea97 100644 --- a/code/game/dna/genes/vg_powers.dm +++ b/code/game/dna/genes/vg_powers.dm @@ -239,9 +239,9 @@ action_icon_state = "genetic_view" /obj/effect/proc_holder/spell/targeted/remoteview/choose_targets(mob/user = usr) - var/list/targets = living_mob_list + var/list/targets = list() var/list/remoteviewers = new /list() - for(var/mob/M in targets) + for(var/mob/M in living_mob_list) if(PSY_RESIST in M.mutations) continue if(REMOTE_VIEW in M.mutations)