mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 11:05:03 +01:00
fix comms computer timer display
This commit is contained in:
@@ -96,7 +96,7 @@ SUBSYSTEM_DEF(shuttle)
|
||||
/datum/controller/subsystem/shuttle/proc/secondsToRefuel()
|
||||
var/elapsed = world.time - SSticker.round_start_time
|
||||
var/remaining = round((config.shuttle_refuel_delay - elapsed) / 10)
|
||||
return remaining ? remaining : 0
|
||||
return remaining > 0 ? remaining : 0
|
||||
|
||||
/datum/controller/subsystem/shuttle/proc/requestEvac(mob/user, call_reason)
|
||||
if(!emergency)
|
||||
@@ -136,7 +136,7 @@ SUBSYSTEM_DEF(shuttle)
|
||||
call_reason = trim(html_encode(call_reason))
|
||||
|
||||
if(length(call_reason) < CALL_SHUTTLE_REASON_LENGTH)
|
||||
to_chat(user, "You must provide a reason.")
|
||||
to_chat(user, "Reason is too short. [CALL_SHUTTLE_REASON_LENGTH] character minimum.")
|
||||
return
|
||||
|
||||
var/area/signal_origin = get_area(user)
|
||||
|
||||
@@ -155,7 +155,6 @@
|
||||
var/input = clean_input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","")
|
||||
if(!input || ..() || !is_authenticated(usr))
|
||||
return
|
||||
|
||||
call_shuttle_proc(usr, input)
|
||||
if(SSshuttle.emergency.timer)
|
||||
post_status("shuttle")
|
||||
@@ -393,6 +392,7 @@
|
||||
data["esc_status"] += " [timeleft / 60 % 60]:[add_zero(num2text(timeleft % 60), 2)]"
|
||||
else if(secondsToRefuel)
|
||||
data["esc_status"] = "Refueling: [secondsToRefuel / 60 % 60]:[add_zero(num2text(secondsToRefuel % 60), 2)]"
|
||||
data["esc_section"] = data["esc_status"] || data["esc_callable"] || data["esc_recallable"] || data["lastCallLoc"]
|
||||
return data
|
||||
|
||||
/obj/machinery/computer/communications/proc/setCurrentMessage(var/mob/user,var/value)
|
||||
|
||||
@@ -40,38 +40,40 @@ export const CommunicationsComputer = (props, context) => {
|
||||
)}
|
||||
</LabeledList>
|
||||
</Section>
|
||||
<Section title="Escape Shuttle">
|
||||
<LabeledList>
|
||||
{!!data.esc_status && (
|
||||
<LabeledList.Item label="Status">
|
||||
{data.esc_status}
|
||||
</LabeledList.Item>
|
||||
)}
|
||||
{!!data.esc_callable && (
|
||||
<LabeledList.Item label="Options">
|
||||
<Button
|
||||
icon="rocket"
|
||||
content="Call Shuttle"
|
||||
disabled={!data.authenticated}
|
||||
onClick={() => act('callshuttle')} />
|
||||
</LabeledList.Item>
|
||||
)}
|
||||
{!!data.esc_recallable && (
|
||||
<LabeledList.Item label="Options">
|
||||
<Button
|
||||
icon="times"
|
||||
content="Recall Shuttle"
|
||||
disabled={!data.authenticated || data.is_ai}
|
||||
onClick={() => act('cancelshuttle')} />
|
||||
</LabeledList.Item>
|
||||
)}
|
||||
{!!data.lastCallLoc && (
|
||||
<LabeledList.Item label="Last Call/Recall From">
|
||||
{data.lastCallLoc}
|
||||
</LabeledList.Item>
|
||||
)}
|
||||
</LabeledList>
|
||||
</Section>
|
||||
{!!data.esc_section && (
|
||||
<Section title="Escape Shuttle">
|
||||
<LabeledList>
|
||||
{!!data.esc_status && (
|
||||
<LabeledList.Item label="Status">
|
||||
{data.esc_status}
|
||||
</LabeledList.Item>
|
||||
)}
|
||||
{!!data.esc_callable && (
|
||||
<LabeledList.Item label="Options">
|
||||
<Button
|
||||
icon="rocket"
|
||||
content="Call Shuttle"
|
||||
disabled={!data.authenticated}
|
||||
onClick={() => act('callshuttle')} />
|
||||
</LabeledList.Item>
|
||||
)}
|
||||
{!!data.esc_recallable && (
|
||||
<LabeledList.Item label="Options">
|
||||
<Button
|
||||
icon="times"
|
||||
content="Recall Shuttle"
|
||||
disabled={!data.authenticated || data.is_ai}
|
||||
onClick={() => act('cancelshuttle')} />
|
||||
</LabeledList.Item>
|
||||
)}
|
||||
{!!data.lastCallLoc && (
|
||||
<LabeledList.Item label="Last Call/Recall From">
|
||||
{data.lastCallLoc}
|
||||
</LabeledList.Item>
|
||||
)}
|
||||
</LabeledList>
|
||||
</Section>
|
||||
)}
|
||||
</Fragment>
|
||||
);
|
||||
let announceText = "Make Priority Announcement";
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user