Skip to content

Commit

Permalink
praetorian acid ball fix (#5486)
Browse files Browse the repository at this point in the history
# About the pull request

The plasma and cooldown check wasnt being checked properly, which meant
you could spam to run out of plasma.

# Explain why it's good for the game
bugfix


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: Fixes praetorian acid ball eating up plasma if its on cooldown
/:cl:

Co-authored-by: InsaneRed <[email protected]>
  • Loading branch information
Red-byte3D and InsaneRed authored Jan 18, 2024
1 parent d76b4fd commit 2bc0fda
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,9 @@
if (!X.check_state() || X.action_busy)
return

if (!action_cooldown_check() && check_and_use_plasma_owner())
if (!action_cooldown_check())
return
if (!check_and_use_plasma_owner())
return

var/turf/current_turf = get_turf(X)
Expand All @@ -750,8 +752,6 @@
to_chat(X, SPAN_XENODANGER("We cancel our acid ball."))
return

if (!action_cooldown_check())
return

apply_cooldown()

Expand Down

0 comments on commit 2bc0fda

Please sign in to comment.