From 670346384ddda871c15678d6fe0c835523cd3cbd Mon Sep 17 00:00:00 2001 From: Adrer Date: Wed, 5 Jun 2024 20:57:22 +0200 Subject: [PATCH] Apex predator & predator senses locker fixes (#25797) * Replica syndicate space suit sprites * Revert "Replica syndicate space suit sprites" This reverts commit 1fb5cf68ac72fe50f08de690502db36e205ee014. * Apex predator now checks turf Z level * Same fixes for predator senses * Minor fixes * More brackets --------- Co-authored-by: adrermail@gmail.com --- code/modules/antagonists/changeling/powers/apex_predator.dm | 4 +++- .../antagonists/vampire/vampire_powers/hemomancer_powers.dm | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/changeling/powers/apex_predator.dm b/code/modules/antagonists/changeling/powers/apex_predator.dm index 60306e115f6..038c3bd27f7 100644 --- a/code/modules/antagonists/changeling/powers/apex_predator.dm +++ b/code/modules/antagonists/changeling/powers/apex_predator.dm @@ -10,7 +10,9 @@ /datum/action/changeling/apex_predator/sting_action(mob/user) var/list/target_by_name = list() for(var/mob/living/carbon/human/possible_target as anything in GLOB.human_list) - if(!possible_target.mind || possible_target.z != user.z) + var/turf/target_turf = get_turf(possible_target) + var/turf/user_turf = get_turf(user) + if(!possible_target.mind || (target_turf.z != user_turf.z)) continue target_by_name[possible_target.real_name] = possible_target diff --git a/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm b/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm index d0e39dff30f..92811776021 100644 --- a/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm +++ b/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm @@ -280,7 +280,9 @@ return A /datum/spell/vampire/predator_senses/valid_target(mob/target, mob/user) - return target.z == user.z && target.mind + var/turf/target_turf = get_turf(target) + var/turf/user_turf = get_turf(user) + return target.mind && (target_turf.z == user_turf.z) /datum/spell/vampire/predator_senses/cast(list/targets, mob/user) var/targets_by_name = list()