Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only /overmaps are passed to after_enter() #2678

Merged
merged 1 commit into from
Jul 12, 2024
Merged

Only /overmaps are passed to after_enter() #2678

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nsv13/code/modules/overmap/FTL/ftl_jump.dm
View file
Open in desktop
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
Loading