From 262618463cb7df1c47b2fba63884ec2afd38c98d Mon Sep 17 00:00:00 2001 From: Cenrus <31044876+Cenrus@users.noreply.github.com> Date: Fri, 20 Mar 2020 15:22:57 +0000 Subject: [PATCH] Minor TGUI Fixes (#1372) * Merge pull request #10414 from CameronWoof/lights-booooooooooooooi The Great Citadel De-Pissening of 2020 * fixes the crew console vitals square (#48087) The square uses brute damage twice and doesn't use burn damage, so there are situations where the square would say you're fine while having 200 burn damage, or saying you're dead because of 100 brute. * 0.1u pills fix * adds tooltips to cargo (#48502) * adds tooltips to cargo * rebuild * rebuilding * h --- code/modules/reagents/chemistry/machinery/chem_master.dm | 2 +- tgui-next/packages/tgui/interfaces/Cargo.js | 2 ++ tgui-next/packages/tgui/interfaces/CrewConsole.js | 2 +- tgui-next/packages/tgui/public/tgui.bundle.js | 4 ++-- tgui/assets/tgui.js | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 20052bd085c1e..2c031da95e0d7 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -271,7 +271,7 @@ "Maximum [vol_each_max] units per item.", "How many units to fill?", vol_each_max)) - vol_each = CLAMP(round(vol_each), 0, vol_each_max) + vol_each = CLAMP(vol_each, 0, vol_each_max) if(vol_each <= 0) return FALSE // Get item name diff --git a/tgui-next/packages/tgui/interfaces/Cargo.js b/tgui-next/packages/tgui/interfaces/Cargo.js index 32a6ae845ce14..90e2a9ac81e48 100644 --- a/tgui-next/packages/tgui/interfaces/Cargo.js +++ b/tgui-next/packages/tgui/interfaces/Cargo.js @@ -162,6 +162,8 @@ const Catalog = props => { content={(data.self_paid ? Math.round(pack.cost * 1.1) : pack.cost) + ' credits'} + tooltip={pack.desc} + tooltipPosition="left" onClick={() => act(ref, 'add', { id: pack.id, })} /> diff --git a/tgui-next/packages/tgui/interfaces/CrewConsole.js b/tgui-next/packages/tgui/interfaces/CrewConsole.js index 0cf03d572ab0d..daa27cb7de577 100644 --- a/tgui-next/packages/tgui/interfaces/CrewConsole.js +++ b/tgui-next/packages/tgui/interfaces/CrewConsole.js @@ -92,7 +92,7 @@ export const CrewConsole = props => { color={healthToColor( sensor.oxydam, sensor.toxdam, - sensor.brutedam, + sensor.burndam, sensor.brutedam)} />