cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into tgui_whitescreenfix_port

Browse Source
This commit is contained in:
Artur
2020-11-22 13:29:26 +02:00
parent 6cdef62abb 4dc7e667a7
commit 84b299912a
466 changed files with 2061 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tgui/packages/tgui/interfaces/OperatingComputer.js
View File

@@ -90,7 +90,7 @@ const PatientStateView = (props, context) => {
</ProgressBar>
</LabeledList.Item>
{damageTypes.map(type => (
<LabeledList.Item key={type.type} label={type.label}>
<LabeledList.Item key={type.type} label={(patient.is_robotic_organism && type.label === 'Toxin') ? 'Corruption' : type.label}>
<ProgressBar
value={patient[type.type] / patient.maxHealth}
color="bad">

2
tgui/packages/tgui/interfaces/Sleeper.js
View File

@@ -73,7 +73,7 @@ export const Sleeper = (props, context) => {
{damageTypes.map(type => (
<LabeledList.Item
key={type.type}
label={type.label}>
label={occupant.is_robotic_organism && type.label === 'Toxin' ? 'Corruption' : type.label}>
<ProgressBar
value={occupant[type.type]}
minValue={0}