a

cmss13-devs · Apr 25, 2024 · f9f9184 · f9f9184
1 parent 4d7a5d1
commit f9f9184
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/code/defines/procs/announcement.dm b/code/defines/procs/announcement.dm
@@ -42,6 +42,11 @@
 				continue
 			if(is_mainship_level(H.z)) // People on ship see everything
 				continue
+
+			// If they have iff AND a marine headset they will recieve announcements
+			if ((FACTION_MARINE in H.wear_id?.faction_group) && (istype(H.wear_l_ear, /obj/item/device/radio/headset/almayer) || istype(H.wear_r_ear, /obj/item/device/radio/headset/almayer)))
+				continue
+
 			if((H.faction != faction_to_display && !add_PMCs) || (H.faction != faction_to_display && add_PMCs && !(H.faction in FACTION_LIST_WY)) && !(faction_to_display in H.faction_group)) //faction checks
 				targets.Remove(H)
 

diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
@@ -115,7 +115,7 @@
 			. += "Primary Objective: [html_decode(assigned_squad.primary_objective)]"
 		if(assigned_squad.secondary_objective)
 			. += "Secondary Objective: [html_decode(assigned_squad.secondary_objective)]"
-	if(faction == FACTION_MARINE)
+	if(faction == FACTION_MARINE || (FACTION_MARINE in wear_id.faction_group))
 		. += ""
 		. += "<a href='?MapView=1'>View Tactical Map</a>"
 	if(mobility_aura)