Skip to content

fixes to radio channels again #87

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

Open
JohnFulpWillard wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fixes to radio channels again #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50fe6e3
fixes to radio channel colors
JohnFulpWillard Dec 21, 2024
cee3bcb
revert
JohnFulpWillard Dec 21, 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
2 changes: 1 addition & 1 deletion code/game/communications.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ GLOBAL_LIST_INIT(reverseradiochannels, list(
"[FREQ_VANGRAFFS]" = RADIO_CHANNEL_VANGRAFFS,
"[FREQ_NRPD]" = RADIO_CHANNEL_NRPD,
"[FREQ_NCRCF]" = RADIO_CHANNEL_NCRCF,
"[FREQ_GOVERNMENT]" = RADIO_CHANNEL_GOVERNMENT
"[FREQ_GOVERNMENT]" = RADIO_CHANNEL_GOVERNMENT,

))

Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -306,7 +306,7 @@

/obj/item/encryptionkey/headset_vangraffs
name = "Van Graffs radio encryption key"
desc = "An encryption key for a radio headset. To access the Van Graff channel, use :w."
desc = "An encryption key for a radio headset. To access the Van Graff channel, use :v."
icon_state = "cypherkey"
channels = list(RADIO_CHANNEL_VANGRAFFS = 1)

Expand All @@ -324,7 +324,7 @@

/obj/item/encryptionkey/headset_government
name = "Government radio encryption key"
desc = "An encryption key for a radio headset. To access the Government channel, use :w."
desc = "An encryption key for a radio headset. To access the Government channel, use :g."
icon_state = "cypherkey"
channels = list(RADIO_CHANNEL_GOVERNMENT = 1)

Expand Down
6 changes: 3 additions & 3 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 @@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
RADIO_CHANNEL_VANGRAFFS = RADIO_TOKEN_VANGRAFFS,
RADIO_CHANNEL_NRPD = RADIO_TOKEN_NRPD,
RADIO_CHANNEL_NCRCF = RADIO_TOKEN_NCRCF,
RADIO_CHANNEL_GOVERNMENT = RADIO_TOKEN_GOVERNMENT
RADIO_CHANNEL_GOVERNMENT = RADIO_TOKEN_GOVERNMENT,
))

/obj/item/radio/headset
Expand Down Expand Up @@ -421,7 +421,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(

/obj/item/radio/headset/headset_usps
name = "post office radio headset"
desc = "This is used by the town.\nTo access the postal channel, use :p. \nTo access the town channel, use :f."
desc = "This is used by the town.\nTo access the postal channel, use :s. \nTo access the town channel, use :f."
icon_state = "com_headset"
keyslot = new /obj/item/encryptionkey/headset_usps

Expand Down Expand Up @@ -526,7 +526,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(

/obj/item/radio/headset/headset_government_nrpd
name = "NCR government headset"
desc = "This is used by the NCR Command. \nTo access the NRPD channel, use :p. \nTo access the Government channel, use :g."
desc = "This is used by the NCR Command. \nTo access the NRPD channel, use :e. \nTo access the Government channel, use :g."
icon_state = "mine_headset"
keyslot = new /obj/item/encryptionkey/headset_nrpd
keyslot2 = new /obj/item/encryptionkey/headset_government
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui-panel/chat/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const MESSAGE_TYPES = [
name: 'Radio',
description: 'All departments of radio messages',
selector:
'.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .secradio, .engradio, .medradio, .sciradio, .suppradio, .servradio, .radio, .deptradio, .binarysay, .newscaster, .resonate, .vaultradio, .ncrradio, .bosradio, .enclaveradio, .denradio, .townradio, .legionradio, .rangerradio, .khansradio, .ldsradio, .uspsradio, .eightiesradio, .eightiesbradio, .eightiesrradio, .wndradio, .montegobayradio, .bishopradio, .wrightradio, .vangraffsradio, .nrpdradio, .ncrcfradio, .governmentradio',
'.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .secradio, .engradio, .medradio, .sciradio, .suppradio, .servradio, .radio, .deptradio, .binarysay, .newscaster, .resonate, .vaultradio, .ncrradio, .bosradio, .enclaveradio, .denradio, .townradio, .legionradio, .rangerradio, .khansradio, .ldsradio, .uspsradio, .eightiesradio, .eightiesbradio, .eightiesrradio, .wndradio, .montegobayradio, .bishopsradio, .wrightsradio, .vangraffsradio, .nrpdradio, .ncrcfradio, .governmentradio, .salvatoresradio, .mordinosradio, .hotelradio',
},
{
type: MESSAGE_TYPE_INFO,
Expand Down
27 changes: 13 additions & 14 deletions tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,9 +1128,8 @@ $border-width-px: $border-width * 1px;
}
}

.vaultradio {
.vaultradio {
color: #6eaa2c;

}
.ncrradio {
color: #eaaa54;
Expand Down Expand Up @@ -1165,23 +1164,23 @@ $border-width-px: $border-width * 1px;
}

.ldsradio {
color: #D4AF37;
color: #d4af37;
}

.uspsradio {
color: #004B87;
color: #004b87;
}

.eightiesradio {
color: #1858D9;
color: #1858d9;
}

.eightiesbradio {
color: #0000FF;
color: #0000ff;
}

.eightiesrradio {
color: #FF0000;
color: #ff0000;
}

.wndradio {
Expand All @@ -1193,37 +1192,37 @@ $border-width-px: $border-width * 1px;
}

.salvatoresradio {
color: #FF99CC;
color: #ff99cc;
}

.mordinosradio {
color: #FF7566;
color: #ff7566;
}

.hotelradio {
color: #F7EFCF;
color: #f7efcf;
}

.bishopsradio {
color: #8CA2BD;
}

.wrightsradio {
color: #B3875E;
color: #b3875e;
}

.vangraffsradio {
color: #4da34e;
}

.nrpdsradio {
.nrpdradio {
color: #606896;
}

.ncrcfsradio {
.ncrcfradio {
color: #d9b884;
}

.governmentsradio {
.governmentradio {
color: #7b5fb3;
}
6 changes: 3 additions & 3 deletions tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,14 +1249,14 @@ $border-width-px: $border-width * 1px;
color: #4da34e;
}

.nrpdsradio {
.nrpdradio {
color: #606896;
}

.ncrcfsradio {
.ncrcfradio {
color: #d9b884;
}

.governmentsradio {
.governmentradio {
color: #7b5fb3;
}