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

IOs Default To Using Intel Channel #4474

Merged
merged 4 commits into from
Sep 23, 2023
Merged

IOs Default To Using Intel Channel #4474

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
848e6ca
IntelCommit
Sep 22, 2023
55c1c66
Merge branch 'master' into IOSquadSpeech
Steelpoint Sep 23, 2023
4409fab
MorChange
Sep 23, 2023
7d849d4
Change
Sep 23, 2023
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
2 changes: 1 addition & 1 deletion code/game/jobs/job/marine/squads.dm
View file
Open in desktop
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
View file
Open in desktop
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_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, RADIO_CHANNEL_ALMAYER = TRUE)
Steelpoint marked this conversation as resolved.
Show resolved Hide resolved

/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
View file
Open in desktop
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