Co-authored-by: DreamySkrell <>
This commit is contained in:
DreamySkrell
2023-07-19 12:18:43 +02:00
committed by GitHub
parent 914eedf240
commit e1049cd5d2
3 changed files with 48 additions and 5 deletions
+2 -1
View File
@@ -925,7 +925,8 @@
var/list/data = list()
var/isAdmin = isobserver(user) && check_rights(R_ADMIN, FALSE, user)
data["locked"] = (locked && !emagged)
data["power_cell_status"] = cell?.percent()
data["power_cell_inserted"] = cell != null
data["power_cell_charge"] = cell?.percent()
data["fail_time"] = failure_timer * 2
data["silicon_user"] = isAdmin || issilicon(user)
data["total_load"] = round(lastused_total)
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: DreamySkrell
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "APC with discharged power cell shows there's no cell inside."
+5 -4
View File
@@ -5,7 +5,8 @@ import { Window } from '../layouts';
export type APCData = {
locked: BooleanLike;
power_cell_status: number;
power_cell_inserted: BooleanLike;
power_cell_charge: number;
fail_time: number;
silicon_user: BooleanLike;
total_load: number;
@@ -99,14 +100,14 @@ export const APCWindow = (props, context) => {
)}
</LabeledList.Item>
<LabeledList.Item label="Power Cell">
{data.power_cell_status ? (
{data.power_cell_inserted ? (
<ProgressBar
ranges={{
good: [75, 100],
average: [30, 75],
bad: [0, 30],
}}
value={data.power_cell_status}
value={data.power_cell_charge}
minValue={0}
maxValue={100}
/>
@@ -114,7 +115,7 @@ export const APCWindow = (props, context) => {
<Box color="bad">Power cell removed.</Box>
)}
</LabeledList.Item>
{data.power_cell_status ? (
{data.power_cell_inserted ? (
<LabeledList.Item label="Charge Mode">
{!data.silicon_user && data.locked ? (
<Box color={data.charge_mode ? 'good' : 'bad'}>