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

New Pizza Cutters #6697

Merged
merged 24 commits into from
Aug 21, 2024
Merged

New Pizza Cutters #6697

merged 24 commits into from
Aug 21, 2024

Conversation

Mensla
Copy link
Contributor

@Mensla Mensla commented Jul 12, 2024 •
edited by github-actions bot
Loading

About the pull request

Re-trying this PR as last time I got caught up with IRL stuff and let it rot.

Adds two new pizza cutter sprites, one with a plastic handle and one with a wooden handle. Adds item sprites and hand-holding sprites.

No more comically large pizza cutter as they're now appropriately sized sprites in your hand.

Explain why it's good for the game

Allows for people to use a normal and non-memey pizza cutter.

Testing Photographs and Procedure

Screenshots & Videos

image
image

Changelog

🆑
add: Added new pizza cutter sprites.
/:cl:

@Mensla Mensla requested a review from Nanu308 as a code owner July 12, 2024 23:55
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 12, 2024
@cm13-github
Copy link
Contributor

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

@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Feature Feature coder badge labels Jul 12, 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 15, 2024
Nanu308
Nanu308 previously requested changes Jul 18, 2024
View reviewed changes
Copy link
Member

@Nanu308 Nanu308 left a comment

Choose a reason for hiding this comment

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

Fix the errors from the pipeline/CI

@Nanu308 Nanu308 marked this pull request as draft July 18, 2024 01:00
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 18, 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 21, 2024
@cm13-github
Copy link
Contributor

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

@Mensla Mensla marked this pull request as ready for review July 21, 2024 19:35
Mensla
Mensla commented Jul 21, 2024
View reviewed changes
Copy link
Contributor Author

@Mensla Mensla left a comment

Choose a reason for hiding this comment

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

Should be good to go, just needs reviewing now

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 1, 2024

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 Aug 1, 2024
nauticall
nauticall requested changes Aug 3, 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.

image
looks like you inadvertently deleted some of the newer sprites merged, unless this was intentional? if not you should look into readding them

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 6, 2024
@cm13-github
Copy link
Contributor

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

Drulikar
Drulikar requested changes Aug 6, 2024
View reviewed changes
code/game/objects/items/tools/kitchen_tools.dm Outdated Show resolved Hide resolved
code/game/objects/items/tools/kitchen_tools.dm Outdated Show resolved Hide resolved
code/game/objects/items/tools/kitchen_tools.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft August 6, 2024 17:00
@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 Aug 10, 2024
@Mensla Mensla marked this pull request as ready for review August 10, 2024 15:01
Drulikar
Drulikar previously approved these changes Aug 10, 2024
View reviewed changes
@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Aug 17, 2024
@Zonespace27 Zonespace27 added this pull request to the merge queue Aug 21, 2024
Merged via the queue into cmss13-devs:master with commit 229c3b6 Aug 21, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Aug 21, 2024
@cm13-github
Automatic changelog for PR #6697 [ci skip]
9979760
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Nanu308 Nanu308 Nanu308 left review comments

@Zonespace27 Zonespace27 Zonespace27 approved these changes

@nauticall nauticall nauticall approved these changes

@Drulikar Drulikar Drulikar left review comments

Assignees
No one assigned
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game. Stale beg a maintainer to review your PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Mensla @cm13-github @Zonespace27 @nauticall @Nanu308 @Drulikar