Skip to content

Commit

Permalink
IOs Default To Using Intel Channel (#4474)
Browse files Browse the repository at this point in the history
# About the pull request

Intel Officers will now default to speaking into the intel squad channel
instead of the Almayer general channel.

# Explain why it's good for the game

Its best for the Intel squad to speak into the Intel comms. It may also
slowly shift the IO culture towards cooperation and communication
instead of solo ops.


# 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:
add: Intel Officers will now default to using the Intel radio channel
when communicating.
/:cl:

---------

Co-authored-by: Steelpoint <[email protected]>
  • Loading branch information
Steelpoint and Steelpoint authored Sep 23, 2023
1 parent 53bc943 commit 1d001e8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion code/game/jobs/job/marine/squads.dm
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
use_stripe_overlay = FALSE
equipment_color = "#053818"
minimap_color = MINIMAP_SQUAD_INTEL
radio_freq = PUB_FREQ
radio_freq = INTEL_FREQ

roundstart = FALSE
prepend_squad_name_to_assignment = FALSE
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/radio/encryptionkey.dm
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
/obj/item/device/encryptionkey/io
name = "\improper Marine Intelligence Officer Radio Encryption Key"
icon_state = "cap_key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_INTEL = TRUE)
channels = list(RADIO_CHANNEL_ALMAYER = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE)

/obj/item/device/encryptionkey/vc
name = "\improper Marine Vehicle Crewman Radio Encryption Key"
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/devices/radio/headset.dm
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@
name = "marine intel radio headset"
desc = "Used by Intelligence Officers. Channels are as follows: :v - marine command, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad, :n - engineering, :m - medical, :j - JTAC, :t - intel."
initial_keys = list(/obj/item/device/encryptionkey/io)
frequency = INTEL_FREQ

/obj/item/device/radio/headset/almayer/mcl
name = "corporate liaison radio headset"
Expand Down

0 comments on commit 1d001e8

Please sign in to comment.