Skip to content

Commit

Permalink
Fixes fighters not receiving relayed overmap alerts (BeeStation#2622)
Browse files Browse the repository at this point in the history
  • Loading branch information
Bokkiewokkie authored and IndusRobot committed Dec 16, 2024
1 parent 1cb9f6b commit 46a1858
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
antag_datum = /datum/antagonist/bloodling

/datum/role_preference/antagonist/pvp
name = "Galactic Conquest"
name = "Syndicate Crewmember (Galactic Conquest)"
antag_datum = /datum/antagonist/nukeop/syndi_crew
6 changes: 6 additions & 0 deletions nsv13/code/modules/overmap/overmap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -821,10 +821,16 @@ Proc to spool up a new Z-level for a player ship and assign it a treadmill.
SEND_SOUND(M, sound(S, repeat = loop, wait = 0, volume = 100))
if(message)
to_chat(M, message)
for(var/obj/structure/overmap/O as() in overmaps_in_ship) //Of course they get relayed the same message if they're in the same ship too
if(length(O.mobs_in_ship))
O.relay(args)

/obj/structure/overmap/proc/stop_relay(channel) //Stops all playing sounds for crewmen on N channel.
for(var/mob/M as() in mobs_in_ship)
M.stop_sound_channel(channel)
for(var/obj/structure/overmap/O as() in overmaps_in_ship) //Of course they get relayed the same message if they're in the same ship too
if(length(O.mobs_in_ship))
O.stop_relay(args)

/obj/structure/overmap/proc/relay_to_nearby(S, message, ignore_self=FALSE, sound_range=20, faction_check=FALSE) //Sends a sound + text message to nearby ships
for(var/obj/structure/overmap/ship as() in GLOB.overmap_objects) //Might be called in hyperspace or by fighters, so shouldn't use a system check.
Expand Down

0 comments on commit 46a1858

Please sign in to comment.