Skip to content

Commit

Permalink
big red insert hotfixes (#7657)
Browse files Browse the repository at this point in the history
# About the pull request

remove cl tracker from HvH pmc headsets
re-add accidentally removed paygrade
pmcs no longer get all marine faction announcements by default

# Explain why it's good for the game

bugs bad and pmcs shouldnt get marine faction announcements by default

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl: BOBAMA
fix: missing paygrades, remove CL tracker on hvh headsets, pmcs on
longer get all marine announcements by default
/:cl:
  • Loading branch information
BOBAMAx authored Dec 2, 2024
1 parent 29e6312 commit fb65338
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion code/defines/procs/announcement.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@


//general marine announcement
/proc/marine_announcement(message, title = COMMAND_ANNOUNCE, sound_to_play = sound('sound/misc/notice2.ogg'), faction_to_display = FACTION_MARINE, add_PMCs = TRUE, signature, logging = ARES_LOG_MAIN)
/proc/marine_announcement(message, title = COMMAND_ANNOUNCE, sound_to_play = sound('sound/misc/notice2.ogg'), faction_to_display = FACTION_MARINE, add_PMCs = FALSE, signature, logging = ARES_LOG_MAIN)
var/list/targets = GLOB.human_mob_list + GLOB.dead_mob_list
if(faction_to_display == FACTION_MARINE)
for(var/mob/M in targets)
Expand Down
4 changes: 4 additions & 0 deletions code/game/objects/items/devices/radio/headset.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1009,6 +1009,7 @@

/obj/item/device/radio/headset/distress/pmc/cct/hvh
initial_keys = list(/obj/item/device/encryptionkey/colony, /obj/item/device/encryptionkey/pmc/engi)
misc_tracking = FALSE

/obj/item/device/radio/headset/distress/pmc/medic
name = "PMC-MED headset"
Expand All @@ -1017,6 +1018,7 @@

/obj/item/device/radio/headset/distress/pmc/medic/hvh
initial_keys = list(/obj/item/device/encryptionkey/colony, /obj/item/device/encryptionkey/pmc/medic)
misc_tracking = FALSE

/obj/item/device/radio/headset/distress/pmc/command
name = "PMC-CMD headset"
Expand All @@ -1025,6 +1027,7 @@

/obj/item/device/radio/headset/distress/pmc/command/hvh
initial_keys = list(/obj/item/device/encryptionkey/colony, /obj/item/device/encryptionkey/pmc/command)
misc_tracking = FALSE

/obj/item/device/radio/headset/distress/pmc/command/director
name = "WY director headset"
Expand All @@ -1035,6 +1038,7 @@
/obj/item/device/radio/headset/distress/pmc/command/director/hvh
maximum_keys = 3
initial_keys = list(/obj/item/device/encryptionkey/colony, /obj/item/device/encryptionkey/pmc/command, /obj/item/device/encryptionkey/commando)
misc_tracking = FALSE



Expand Down
4 changes: 2 additions & 2 deletions code/modules/admin/tabs/event_tab.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
set category = "Admin.Events"
if(!admin_holder)
return

var/flag = tgui_input_list(src, "Which flag?", "Whitelist Flags", GLOB.bitfields["whitelist_status"])

var/list/ckeys = list()
Expand Down Expand Up @@ -576,7 +576,7 @@

if(alert("Press \"Yes\" if you want to announce it to ship crew and marines. Press \"No\" to keep it only as printed report on communication console.",,"Yes","No") == "Yes")
if(alert("Do you want PMCs (not Death Squad) to see this announcement?",,"Yes","No") == "Yes")
marine_announcement(input, customname, 'sound/AI/commandreport.ogg', faction)
marine_announcement(input, customname, 'sound/AI/commandreport.ogg', faction, TRUE)
else
marine_announcement(input, customname, 'sound/AI/commandreport.ogg', faction, FALSE)
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@
idtype = /obj/item/card/id/pmc
assignment = JOB_PMC_SYNTH
rank = JOB_PMC_SYNTH
paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0)
role_comm_title = "WY Syn"
skills = /datum/skills/synthetic
minimap_icon = "pmc_syn"
Expand Down

0 comments on commit fb65338

Please sign in to comment.