Skip to content

Commit

Permalink
Only /overmaps are passed to after_enter() (#2678)
Browse files Browse the repository at this point in the history
  • Loading branch information
DeltaFire15 committed Jul 12, 2024
1 parent 1c03630 commit 5408a33
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions nsv13/code/modules/overmap/FTL/ftl_jump.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, "<span class='notice'><h2>Now entering [name]...</h2></span>")
OM.relay(null, "<span class='notice'>[desc]</span>")
//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)
Expand All @@ -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
Expand Down

0 comments on commit 5408a33

Please sign in to comment.