From fb65338db9c1fec0bba559435cca10a150569fba Mon Sep 17 00:00:00 2001 From: BOBAMAx <49925269+BOBAMAx@users.noreply.github.com> Date: Mon, 2 Dec 2024 03:50:08 -0600 Subject: [PATCH] big red insert hotfixes (#7657) # 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
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: BOBAMA fix: missing paygrades, remove CL tracker on hvh headsets, pmcs on longer get all marine announcements by default /:cl: --- code/defines/procs/announcement.dm | 2 +- code/game/objects/items/devices/radio/headset.dm | 4 ++++ code/modules/admin/tabs/event_tab.dm | 4 ++-- .../survivors/solaris/crashlanding-offices_insert_bigred.dm | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/defines/procs/announcement.dm b/code/defines/procs/announcement.dm index 250c81dfc3dc..b6957040304f 100644 --- a/code/defines/procs/announcement.dm +++ b/code/defines/procs/announcement.dm @@ -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) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 205fa7710312..3fd87d7a30a8 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -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" @@ -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" @@ -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" @@ -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 diff --git a/code/modules/admin/tabs/event_tab.dm b/code/modules/admin/tabs/event_tab.dm index 332f7185fd57..72a2e1cf7ffa 100644 --- a/code/modules/admin/tabs/event_tab.dm +++ b/code/modules/admin/tabs/event_tab.dm @@ -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() @@ -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 diff --git a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm index bed04eac198a..c13d666d390e 100644 --- a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm +++ b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm @@ -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"