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

added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. #4586

Merged
merged 28 commits into from
Nov 29, 2023

Conversation

Huffie56
Copy link
Contributor

@Huffie56 Huffie56 commented Oct 4, 2023

About the pull request

i wanted to make it more clear code wise and separating the fridge used on colony and other places from main kitchen.
the food boxes are there to help make stock version having less item into them and make it cleaner.
made two version of each fridge on that hold less for the front kitchen and one for the stock in the back room that hold way more.
remove a bunch of food crate that are duplicate with the vendor.
add a vendor that sell boxes of ingredients.

Explain why it's good for the game

better organization for kitchen and separation from other fridge allow to not add item on top of fridge if you want to give him more...
cook will now be able to buy directly will hydroponic will stay viable and they are still able to order or receive supply from req..

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
add: Added a lot's of food boxes for that hold the basic ingredients for cooking.
add: Added a file to handle the fridges in almayer kitchen.
add: Added a vendor in the kitchen that sell boxes of ingredients.
add: Added a a food crate called surplus boxes ingredient containing random boxes of ingredients.
add: Added a version of this crate that will be freely given via the ASR system.
/:cl:

Julien added 5 commits October 4, 2023 14:45
@github-actions github-actions bot added Mapping did you remember to save in tgm format? Feature Feature coder badge labels Oct 4, 2023
@Diegoflores31
Copy link
Contributor

if you could replace REQ crate to use these boxes it would be neat

@Huffie56
Copy link
Contributor Author

Huffie56 commented Oct 5, 2023

if you could replace REQ crate to use these boxes it would be neat

i intend to make a vendor that sell those boxes to the cook directly using snowflake point pool...

@Huffie56 Huffie56 marked this pull request as ready for review October 6, 2023 14:11
@github-actions
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 Oct 19, 2023
@github-actions github-actions bot closed this Oct 27, 2023
@Huffie56 Huffie56 reopened this Oct 27, 2023
@Huffie56 Huffie56 requested a review from harryob October 27, 2023 09:20
code/game/objects/items/storage/boxes.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft October 30, 2023 10:18
@Huffie56 Huffie56 requested a review from harryob October 30, 2023 11:52
@Huffie56 Huffie56 marked this pull request as ready for review October 30, 2023 11:58
@harryob harryob marked this pull request as draft October 31, 2023 15:09
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Nov 10, 2023
@cm13-github
Copy link
Contributor

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

@Huffie56 Huffie56 marked this pull request as ready for review November 10, 2023 13:20
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 13, 2023
@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 Nov 13, 2023
@cm13-github
Copy link
Contributor

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

@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Nov 14, 2023
Copy link
Contributor

@Birdtalon Birdtalon left a comment

Choose a reason for hiding this comment

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

All your for loops differ from standard advice.. I stopped adding comments when I realised how many there were in this.
https://github.com/cmss13-devs/cmss13/blob/master/.github/guides/STANDARDS.md#in-to-for-loops

code/game/objects/items/storage/boxes.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/boxes.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/boxes.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/boxes.dm Outdated Show resolved Hide resolved
@Huffie56 Huffie56 marked this pull request as draft November 15, 2023 12:13
@Huffie56 Huffie56 marked this pull request as ready for review November 16, 2023 19:46
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 22, 2023
@cm13-github
Copy link
Contributor

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

@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 Nov 22, 2023
@Huffie56
Copy link
Contributor Author

change to the correct for(var/i in 1 to 7) type should be fine

@Birdtalon Birdtalon added this pull request to the merge queue Nov 29, 2023
Merged via the queue into cmss13-devs:master with commit 3f79ad3 Nov 29, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Nov 29, 2023
@Huffie56 Huffie56 deleted the refactor_kitchen branch December 3, 2023 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants