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

Jump to bottom

Yautja Actions Update (/QOL changes) #5294

Merged
merged 3 commits into from
Jan 3, 2024
Merged

Yautja Actions Update (/QOL changes) #5294

merged 3 commits into from
Jan 3, 2024

Conversation

BeagleGaming1
Copy link
Contributor

@BeagleGaming1 BeagleGaming1 commented Dec 25, 2023 •
edited
Loading

About the pull request

This was hell

Action sprites from Cosmic-Overlord/TerraGov-Marine-Corps#206

Explain why it's good for the game

Ease of use

Changelog

🆑 BeagleGaming1, Mr.Crowford
add: Added Yautja action buttons
qol: Added a keybind to control falcon drones
qol: Thwei crystals and healing capsules say how much time until off cooldown
code: Yautja keybinds now redirect to action buttons
code: Changed thwei crystals and healing capsules to cooldowns instead of timers
code: Miscellaneous Yautja-related code cleanup
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge Quality of Life Make the game harder to play Code Improvement Make the code longer labels Dec 25, 2023
@BeagleGaming1 BeagleGaming1 marked this pull request as ready for review December 25, 2023 01:28
@Superwelder Superwelder mentioned this pull request Dec 30, 2023
Closed
3 tasks
@professionallyretarded professionallyretarded mentioned this pull request Dec 31, 2023
Closed
3 tasks
@deathrobotpunch deathrobotpunch mentioned this pull request Dec 31, 2023
Closed
3 tasks
Drulikar
Drulikar requested changes Jan 1, 2024
View reviewed changes
code/modules/cm_preds/yaut_actions.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_actions.dm Show resolved Hide resolved
code/modules/cm_preds/yaut_actions.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_actions.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_actions.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_hudprocs.dm Show resolved Hide resolved
code/modules/cm_preds/yaut_weapons.dm Show resolved Hide resolved
code/modules/cm_preds/yaut_actions.dm Show resolved Hide resolved
code/modules/cm_preds/yaut_actions.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_weapons.dm Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft January 1, 2024 08:12
@Superwelder Superwelder mentioned this pull request Jan 1, 2024
Open
3 tasks
nauticall
nauticall approved these changes Jan 2, 2024
View reviewed changes
Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sprites good

@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Jan 2, 2024
@BeagleGaming1 BeagleGaming1 marked this pull request as ready for review January 2, 2024 20:16
Drulikar
Drulikar approved these changes Jan 2, 2024
View reviewed changes
Copy link
Contributor

@Drulikar Drulikar left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All issues appear resolved and nothing else sticks out to me as needing changing.

The only thing else you may consider is using hide for the actions instead of always add/remove so their positions are more consistent.

@Drulikar Drulikar added this pull request to the merge queue Jan 3, 2024
Merged via the queue into cmss13-devs:master with commit 9cc3d9e Jan 3, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Jan 3, 2024
@cm13-github
Automatic changelog for PR #5294 [ci skip]
6cd0859
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Drulikar Drulikar Drulikar approved these changes

@nauticall nauticall nauticall approved these changes

@realforest2001 realforest2001 realforest2001 approved these changes

Assignees
No one assigned
Labels
Code Improvement Make the code longer Feature Feature coder badge Quality of Life Make the game harder to play Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@BeagleGaming1 @realforest2001 @nauticall @Drulikar