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.

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

Allows maintenance jack to be quick drawn #6275

Merged
merged 6 commits into from
May 14, 2024
Merged

Conversation

Git-Nivrak
Copy link
Contributor

@Git-Nivrak Git-Nivrak commented May 10, 2024

About the pull request

Allows maintenance jack to be quick drawn as well as adding a flag that allows to replicate this behavior for other items.

Explain why it's good for the game

Quality of life, Requested by a player

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
qol: Maintenance jack can now be quick drawn
code: Added a flag that allows items to be quick draw-able despite not being weapons.
/:cl:

@github-actions github-actions bot added Quality of Life Make the game harder to play Code Improvement Make the code longer labels May 10, 2024
code/game/objects/items/tools/maintenance_tools.dm Outdated Show resolved Hide resolved
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

All overrides to flags_atom need to be looked at.

For example /obj/item/weapon/gun/launcher/rocket can normally go into your suit slot and you can press E to draw it, but since /obj/item/weapon/gun overrides flags_atom it now no longer does so since you need the QUICK_DRAWABLE flag, and it doesn't have it.

You may consider using :: to |= existing flags in definitions; but honestly there aren't that many to fix. The regex to find all weapon definitions in this scenario is probably something like ^/obj/item/weapon/[\w/]*?$((.|\n)(?!^/))*?flags_atom ?=(?!^/)
image

@Drulikar Drulikar marked this pull request as draft May 13, 2024 04:29
@Git-Nivrak Git-Nivrak marked this pull request as ready for review May 14, 2024 08:08
@Drulikar Drulikar added this pull request to the merge queue May 14, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 14, 2024
@Drulikar Drulikar added this pull request to the merge queue May 14, 2024
Merged via the queue into cmss13-devs:master with commit 4539d4d May 14, 2024
27 checks passed
cm13-github added a commit that referenced this pull request May 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer Quality of Life Make the game harder to play
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants