cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lets all heads set alert level, restores "Station Time" option to status displays

Browse Source
This commit is contained in:
Chompstation Bot
2020-10-19 10:37:46 +00:00
parent a3f9f88bea
commit 9a46560f06
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/tgui/modules/communications.dm
View File

@@ -104,8 +104,9 @@
"line_2" = (stat_msg2 ? stat_msg2 : "-----"), "line_2" = (stat_msg2 ? stat_msg2 : "-----"),
"presets" = list( "presets" = list(
list("name" = "blank", "label" = "Clear", "desc" = "Blank slate"), list("name" = "blank", "label" = "Clear", "desc" = "Blank slate."),
list("name" = "shuttle", "label" = "Shuttle ETA", "desc" = "Display how much time is left."), list("name" = "time", "label" = "Station Time", "desc" = "The current time according to the station's clock."),
list("name" = "shuttle", "label" = "Tram ETA", "desc" = "Display how much time is left."), //VOREStation Edit - Shuttle ETA -> Tram ETA because we use trams
list("name" = "message", "label" = "Message", "desc" = "A custom message.") list("name" = "message", "label" = "Message", "desc" = "A custom message.")
), ),
) )
@@ -248,7 +249,7 @@
to_chat(usr, "<span class='warning'>Security measures prevent you from changing the alert level.</span>") to_chat(usr, "<span class='warning'>Security measures prevent you from changing the alert level.</span>")
return return
if(check_access(usr, access_captain)) if(is_authenticated(usr))
change_security_level(text2num(params["level"])) change_security_level(text2num(params["level"]))
else else
to_chat(usr, "<span class='warning'>You are not authorized to do this.</span>") to_chat(usr, "<span class='warning'>You are not authorized to do this.</span>")

18
tgui/packages/tgui/interfaces/CommunicationsConsole.js
View File

@@ -81,7 +81,7 @@ const CommunicationsConsoleMain = (props, context) => {
key={slevel.name} key={slevel.name}
icon={slevel.icon} icon={slevel.icon}
content={slevel.name} content={slevel.name}
disabled={!authmax} disabled={!authenticated}
selected={slevel.id === security_level} selected={slevel.id === security_level}
onClick={() => act('newalertlevel', { level: slevel.id })} /> onClick={() => act('newalertlevel', { level: slevel.id })} />
); );
@@ -89,15 +89,8 @@ const CommunicationsConsoleMain = (props, context) => {
return ( return (
<Fragment> <Fragment>
<Section title="Site Director-Only Actions"> <Section title="Site Manager-Only Actions">
<LabeledList> <LabeledList>
<LabeledList.Item label="Current Alert"
color={security_level_color}>
{alertLevelText}
</LabeledList.Item>
<LabeledList.Item label="Change Alert">
{alertLevelButtons}
</LabeledList.Item>
<LabeledList.Item label="Announcement"> <LabeledList.Item label="Announcement">
<Button <Button
icon="bullhorn" icon="bullhorn"
@@ -132,6 +125,13 @@ const CommunicationsConsoleMain = (props, context) => {
</Section> </Section>
<Section title="Command Staff Actions"> <Section title="Command Staff Actions">
<LabeledList> <LabeledList>
<LabeledList.Item label="Current Alert"
color={security_level_color}>
{alertLevelText}
</LabeledList.Item>
<LabeledList.Item label="Change Alert">
{alertLevelButtons}
</LabeledList.Item>
<LabeledList.Item label="Displays"> <LabeledList.Item label="Displays">
<Button <Button
icon="tv" icon="tv"

6
tgui/packages/tgui/public/tgui.bundle.js
View File

File diff suppressed because one or more lines are too long