Skip to content

Common - Make throwWeapon put weapon away after#11058

Merged
Drofseh merged 1 commit intoacemod:masterfrom
DartRuffian:common/shoulder-weapon-after-throw
Sep 19, 2025
Merged

Common - Make throwWeapon put weapon away after#11058
Drofseh merged 1 commit intoacemod:masterfrom
DartRuffian:common/shoulder-weapon-after-throw

Conversation

@DartRuffian
Copy link
Copy Markdown
Contributor

@DartRuffian DartRuffian commented Sep 16, 2025

When merged this pull request will:

  • Make fnc_throwWeapon put the next weapon away instead of selecting it
    • Common issue with ace fire is units throwing their weapon, pulling out another, and then immediately throwing that one. Made more sense IMO to add it to fnc_throwWeapon instead of fnc_burnReaction but I can change it if desired
    • Uses the code from weaponSelect_fnc_putWeaponAway because I'm not sure if common is "allowed" to use functions from other components like that

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

@DartRuffian DartRuffian changed the title Common - Make throwWeapon put weapon away Common - Make throwWeapon put weapon away after Sep 16, 2025
@PabstMirror PabstMirror added this to the 3.20.1 milestone Sep 18, 2025
@PabstMirror PabstMirror added the kind/change Release Notes: **CHANGED:** label Sep 18, 2025
@PabstMirror
Copy link
Copy Markdown
Contributor

Seems reasonable to me

@Drofseh Drofseh merged commit 0ff7d8e into acemod:master Sep 19, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/change Release Notes: **CHANGED:**

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants