From ec7554d3dba669b380514cac29261c2d64838d84 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Mon, 10 Mar 2025 15:39:55 +0100 Subject: [PATCH] queen powers fixed --- code/modules/mob/living/carbon/xenomorph/Powers.dm | 4 +++- .../mob/living/carbon/xenomorph/abilities/general_powers.dm | 4 ++-- .../living/carbon/xenomorph/abilities/queen/queen_powers.dm | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/Powers.dm b/code/modules/mob/living/carbon/xenomorph/Powers.dm index 786b6abd4040..9551ea2b1213 100644 --- a/code/modules/mob/living/carbon/xenomorph/Powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/Powers.dm @@ -197,7 +197,9 @@ to_chat(src, SPAN_NOTICE("We must have a meaning for the mark before you can make it.")) hive.mark_ui.open_mark_menu(src) return FALSE - if(target_turf.z != src.z) + + + if(!SSmapping.same_z_map(target_turf.z, z)) to_chat(src, SPAN_NOTICE("We have no psychic presence on that world.")) return FALSE if(!(istype(target_turf)) || target_turf.density) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm index abcae5bf8a60..fe5b4bfc4899 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm @@ -278,7 +278,7 @@ return FALSE var/turf/target_turf = get_turf(A) - if(target_turf.z != X.z) + if(!SSmapping.same_z_map(target_turf.z, X.z)) to_chat(X, SPAN_XENOWARNING("This area is too far away to affect!")) return if(!X.hive.living_xeno_queen || X.hive.living_xeno_queen.z != X.z) @@ -628,7 +628,7 @@ to_chat(X, SPAN_XENOWARNING("It's too early to spread the hive this far.")) return FALSE - if(T.z != X.z) + if(!SSmapping.same_z_map(T.z, X.z)) to_chat(X, SPAN_XENOWARNING("This area is too far away to affect!")) return FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm index f5e0338cbede..161c35eb1029 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm @@ -710,7 +710,7 @@ var/turf/turf_to_get = get_turf(atom) - if(!turf_to_get || turf_to_get.is_weedable() < FULLY_WEEDABLE || turf_to_get.density || (turf_to_get.z != xeno.z)) + if(!turf_to_get || turf_to_get.is_weedable() < FULLY_WEEDABLE || turf_to_get.density || !(SSmapping.same_z_map(xeno.z,turf_to_get.z))) to_chat(xeno, SPAN_XENOWARNING("You can't do that here.")) return