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

Improvements to box vending in Requisitions #6397

Merged
merged 14 commits into from
Jul 7, 2024

Conversation

ThePiachu
Copy link
Contributor

@ThePiachu ThePiachu commented Jun 7, 2024

About the pull request

Fixes Issue #6096

Some small improvements around the code that handles Requisitions' ammo box vendor filling logic. It now handles boxes that use handfuls (shotgun boxes) and also checks the vendor's inventory for if the boxes already exist to let the devs order them neatly as needed.

Also neatly added the various boxes to Requisitions' vendors that were auto-populated before.

Explain why it's good for the game

It makes the vendors nicer to use and keeps the ammo boxes consistent.

Testing Photographs and Procedure

  • Check Requisitions' vendors
  • Vend shotgun ammo boxes big and small to see the ratios are maitained
Screenshots & Videos

image

Changelog

🆑 ThePiachu
qol: Shotgun ammo boxes now behave like other ammo boxes in the Requisitions' vendors.
code: Ammo box maping code now handles pre-populated boxes in vendors, letting devs order them more neatly than before.
/:cl:

@github-actions github-actions bot added the Missing Changelog Maintainers always document their changes. label Jun 7, 2024
@ThePiachu ThePiachu added Fix Fix one bug, make ten more and removed Missing Changelog Maintainers always document their changes. labels Jun 7, 2024
@github-actions github-actions bot added Quality of Life Make the game harder to play Code Improvement Make the code longer labels 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 15, 2024
code/game/machinery/vending/cm_vending.dm Outdated Show resolved Hide resolved
code/game/machinery/vending/cm_vending.dm Outdated Show resolved Hide resolved
@harryob harryob removed the Stale beg a maintainer to review your PR label Jun 16, 2024
@harryob harryob marked this pull request as draft June 16, 2024 10:21
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 24, 2024
@ThePiachu ThePiachu marked this pull request as ready for review June 24, 2024 13:56
@Drulikar
Copy link
Contributor

Drulikar commented Jul 2, 2024

stale exempt until reviewed

@Drulikar Drulikar added Stale Exempt PR can't go stale and removed Stale beg a maintainer to review your PR labels Jul 2, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 3, 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 removed the Merge Conflict PR can't be merged because it touched too much code label Jul 4, 2024
@cm13-github
Copy link
Contributor

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

code/game/machinery/vending/cm_vending.dm Outdated Show resolved Hide resolved
@harryob harryob enabled auto-merge July 7, 2024 06:08
@harryob harryob added this pull request to the merge queue Jul 7, 2024
Merged via the queue into cmss13-devs:master with commit d5dd4ef Jul 7, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Jul 7, 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 Fix Fix one bug, make ten more Quality of Life Make the game harder to play Stale Exempt PR can't go stale
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants