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

Fixes spec kit, AGAIN #6390

Merged
merged 3 commits into from
Jul 16, 2024

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Jun 7, 2024

About the pull request

I've lost track of how many times I've made fixes for this kit, that is only broken because of me anyway.

Explain why it's good for the game

Makes spec tokens work again! amongst other things.

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
fix: Fixes riflemen spec_kits not being usable by riflemen.
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Jun 7, 2024
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jun 14, 2024
Comment on lines -254 to -256
if(!skillcheckexplicit(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_TRAINED) && !skillcheckexplicit(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL))
to_chat(user, SPAN_WARNING("You already unwrapped your [name], give this one to someone else!"))
return
Copy link
Contributor

Choose a reason for hiding this comment

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

What exactly are we fixing by removing this?

Copy link
Member Author

Choose a reason for hiding this comment

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

This is a duplicate check that is overriding the check in /obj/item/spec_kit/rifleman/can_use(mob/living/carbon/human/user)

@Drulikar Drulikar removed the Stale beg a maintainer to review your PR label Jun 19, 2024
@Drulikar Drulikar marked this pull request as draft June 19, 2024 00:38
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jun 26, 2024
@github-actions github-actions bot closed this Jul 8, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 13, 2024
@realforest2001 realforest2001 removed the Stale beg a maintainer to review your PR label Jul 13, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 13, 2024
@realforest2001 realforest2001 marked this pull request as ready for review July 13, 2024 02:10
@Zonespace27 Zonespace27 added this pull request to the merge queue Jul 16, 2024
Merged via the queue into cmss13-devs:master with commit 78ed6cc Jul 16, 2024
28 checks passed
cm13-github added a commit that referenced this pull request Jul 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants