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

adds distinct color to CLF and UPP special channels #6818

Merged
merged 2 commits into from
Aug 1, 2024
Merged

adds distinct color to CLF and UPP special channels #6818

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
e3de9d2
gg
CapCamIII Jul 29, 2024
9f9ae44
Update communications.dm
CapCamIII Aug 1, 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
16 changes: 11 additions & 5 deletions code/controllers/subsystem/communications.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ SUBSYSTEM_DEF(radio)
"[VAI_FREQ]" = "vairadio",
"[RMC_FREQ]" = "rmcradio",
"[CMB_FREQ]" = "cmbradio",
"[CLF_FREQ]" = "clfradio",
"[ALPHA_FREQ]" = "alpharadio",
"[BRAVO_FREQ]" = "bravoradio",
"[CHARLIE_FREQ]" = "charlieradio",
Expand All @@ -287,6 +286,17 @@ SUBSYSTEM_DEF(radio)
"[COLONY_FREQ]" = "deptradio",
"[BUG_A_FREQ]" = "airadio",
"[BUG_B_FREQ]" = "aiprivradio",
"[UPP_FREQ]" = "syndradio",
"[UPP_CMD_FREQ]" = "opforcmd",
"[UPP_ENGI_FREQ]" = "opforeng",
"[UPP_MED_FREQ]" = "opformed",
"[UPP_CCT_FREQ]" = "opforcct",
"[UPP_KDO_FREQ]" = "opforspe",
"[CLF_FREQ]" = "clfradio",
CapCamIII marked this conversation as resolved.
Show resolved Hide resolved
"[CLF_CMD_FREQ]" = "opforcmd",
"[CLF_ENGI_FREQ]" = "opforeng",
"[CLF_MED_FREQ]" = "opformed",
"[CLF_CCT_FREQ]" = "opforcct",
)

/datum/controller/subsystem/radio/proc/add_object(obj/device as obj, new_frequency as num, filter = null as text|null)
Expand Down Expand Up @@ -359,10 +369,6 @@ SUBSYSTEM_DEF(radio)
return freq_span
if(frequency in PMC_FREQS)
return "pmcradio"
if(frequency in UPP_FREQS)
return "syndradio"
if(frequency in CLF_FREQS)
return "clfradio"
if(frequency in ERT_FREQS)
return "centradio"
if(frequency in DEPT_FREQS)
Expand Down
20 changes: 20 additions & 0 deletions tgui/packages/tgui-panel/styles/goon/chat-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1040,6 +1040,26 @@ em {
color: #3eb489;
}

.opforcmd {
color: #68bcec;
}

.opformed {
color: #52c724;
}

.opforeng {
color: #e9812d;
}

.opforcct {
color: #ec3018;
}

.opforspe {
color: #7221cf;
}

.medium {
font-size: 110%;
}
Expand Down
20 changes: 20 additions & 0 deletions tgui/packages/tgui-panel/styles/goon/chat-light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,6 +1072,26 @@ h2.alert {
color: #3a7e65;
}

.opforcmd {
color: #568dad;
}

.opformed {
color: #3e921d;
}

.opforeng {
color: #b16222;
}

.opforcct {
color: #c42b17;
}

.opforspe {
color: #611fad;
}

.medium {
font-size: 110%;
}
Expand Down
18 changes: 9 additions & 9 deletions tgui/packages/tgui/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,27 +149,27 @@ export const RADIO_CHANNELS = [
{
name: 'UPP CMD',
freq: 1252,
color: '#8f4a4b',
color: '#4a768f',
},
{
name: 'UPP ENG',
freq: 1253,
color: '#8f4a4b',
color: '#8c5223',
},
{
name: 'UPP MED',
freq: 1254,
color: '#8f4a4b',
color: '#159e73',
},
{
name: 'UPP CCT',
freq: 1255,
color: '#8f4a4b',
color: '#b3222e',
},
{
name: 'UPP KDO',
freq: 1259,
color: '#8f4a4b',
color: '#789e18',
},
{
name: 'CLF',
Expand All @@ -179,22 +179,22 @@ export const RADIO_CHANNELS = [
{
name: 'CLF CMD',
freq: 1272,
color: '#8e83ca',
color: '#4a768f',
},
{
name: 'CLF ENG',
freq: 1273,
color: '#8e83ca',
color: '#8c5223',
},
{
name: 'CLF MED',
freq: 1274,
color: '#8e83ca',
color: '#159e73',
},
{
name: 'CLF CCT',
freq: 1275,
color: '#8e83ca',
color: '#b3222e',
},
{
name: 'LSTN BUG A',
Expand Down
Loading