Skip to content

Commit

Permalink
Minor TGUI Fixes (BeeStation#1372)
Browse files Browse the repository at this point in the history
* Merge pull request BeeStation#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
  • Loading branch information
Cenrus authored Mar 20, 2020
1 parent e7f0089 commit 2626184
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion code/modules/reagents/chemistry/machinery/chem_master.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions tgui-next/packages/tgui/interfaces/Cargo.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})} />
Expand Down
2 changes: 1 addition & 1 deletion tgui-next/packages/tgui/interfaces/CrewConsole.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export const CrewConsole = props => {
color={healthToColor(
sensor.oxydam,
sensor.toxdam,
sensor.brutedam,
sensor.burndam,
sensor.brutedam)} />
</Table.Cell>
<Table.Cell collapsing textAlign="center">
Expand Down
4 changes: 2 additions & 2 deletions tgui-next/packages/tgui/public/tgui.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tgui/assets/tgui.js

Large diffs are not rendered by default.

0 comments on commit 2626184

Please sign in to comment.