From 46a185843b229522db7a5506f1d4343b9b0a7d3c Mon Sep 17 00:00:00 2001
From: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Date: Fri, 3 May 2024 22:41:43 +0200
Subject: [PATCH] Fixes fighters not receiving relayed overmap alerts (#2622)

---
 .../modules/antagonists/role_preference/role_antagonists.dm | 2 +-
 nsv13/code/modules/overmap/overmap.dm                       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nsv13/code/modules/antagonists/role_preference/role_antagonists.dm b/nsv13/code/modules/antagonists/role_preference/role_antagonists.dm
index b46cee28337..4da1ef38f9e 100644
--- a/nsv13/code/modules/antagonists/role_preference/role_antagonists.dm
+++ b/nsv13/code/modules/antagonists/role_preference/role_antagonists.dm
@@ -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
diff --git a/nsv13/code/modules/overmap/overmap.dm b/nsv13/code/modules/overmap/overmap.dm
index 63ef5cbdf49..6eec8dbcc49 100644
--- a/nsv13/code/modules/overmap/overmap.dm
+++ b/nsv13/code/modules/overmap/overmap.dm
@@ -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.