From 69507ea04c41d0bc176d09362f3da47d7fadb244 Mon Sep 17 00:00:00 2001 From: DeltaFire <46569814+DeltaFire15@users.noreply.github.com> Date: Fri, 12 Jul 2024 20:12:43 +0200 Subject: [PATCH] Only /overmaps are passed to after_enter() (#2678) --- nsv13/code/modules/overmap/FTL/ftl_jump.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nsv13/code/modules/overmap/FTL/ftl_jump.dm b/nsv13/code/modules/overmap/FTL/ftl_jump.dm index ce78db84359..8fd06aa7043 100644 --- a/nsv13/code/modules/overmap/FTL/ftl_jump.dm +++ b/nsv13/code/modules/overmap/FTL/ftl_jump.dm @@ -39,13 +39,12 @@ OM.forceMove(exit) if(istype(OM, /obj/structure/overmap)) OM.current_system = src //Debugging purposes only - after_enter(OM) + after_enter(OM) /datum/star_system/proc/after_enter(obj/structure/overmap/OM) if(desc) OM.relay(null, "

Now entering [name]...

") OM.relay(null, "[desc]") - //If we have an audio cue, ensure it doesn't overlap with a fleet's one... //End the round upon entering O45. if(system_traits & STARSYSTEM_END_ON_ENTER) if(OM.role == MAIN_OVERMAP) @@ -56,6 +55,7 @@ SSblackbox.record_feedback("text", "nsv_endings", 1, "succeeded") if(!length(audio_cues)) return FALSE + //If we have an audio cue, ensure it doesn't overlap with a fleet's one... for(var/datum/fleet/F as() in fleets) if(length(F.audio_cues) && F.alignment != OM.faction && !F.federation_check(OM)) return TRUE