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

Jump to bottom

Command announcements for survivors #6192

Merged
merged 2 commits into from
May 1, 2024
Merged

Command announcements for survivors #6192

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9f9184
a
Git-Nivrak Apr 25, 2024
9f19be9
Update human.dm
Git-Nivrak Apr 27, 2024
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
5 changes: 5 additions & 0 deletions code/defines/procs/announcement.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/human.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Git-Nivrak marked this conversation as resolved.
Show resolved Hide resolved
. += ""
. += "<a href='?MapView=1'>View Tactical Map</a>"
if(mobility_aura)
Expand Down
Loading