Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Fixes static power usage not always drawing the remaining energy of an APC cell. #2601

Merged
merged 2 commits into from
Mar 28, 2024
Merged

[MIRROR] Fixes static power usage not always drawing the remaining energy of an APC cell. #2601

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f069349
[MIRROR] [NO GBP]Fixes static power usage not always drawing the rema…
NovaBot13 Mar 27, 2024
eebf818
Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG…
Iajret Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/power/apc/apc_main.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
terminal?.add_load(grid_used)
var/cell_used = 0
if(amount > grid_used)
cell_used += cell.use(amount - grid_used)
cell_used += cell.use(amount - grid_used, force = TRUE)
return grid_used + cell_used

/// Draws power from the connected grid. When there isn't enough surplus energy from the grid, draws the rest of the demand from its cell. Returns the energy used.
Expand Down
Loading