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

Newfood: Plates #10920

Merged
merged 28 commits into from
Sep 9, 2024
Merged

Newfood: Plates #10920

merged 28 commits into from
Sep 9, 2024

Conversation

Tsar-Salat
Copy link
Contributor

@Tsar-Salat Tsar-Salat commented Apr 25, 2024

About The Pull Request

Completely replaces the existing plate code with a new system.

Instead of plates being attached to food sprites directly, the instead are dispensed from the Kitchen vendor in three sizes: Small, Medium, and Large.

These plates use a new shattering component, where they will break if thrown.

In addition, anticipating the increased usage of Serving Trays by Cooks, they can now be attached to belts.

Ports:

RESPRITES (the old ones hurt my eyes):

Why It's Good For The Game

Necessary for ovens.

Also:

image
image

image
image

Old images were atrocious

Testing Photographs and Procedure

Screenshots&Videos

Screenshot 2024-04-03 132737

Changelog

🆑 rkz, PaxilManiac, Kryson, Qustinnus, nightred, Greniza, junkgle01
add: Separates plates from food sprites, into their own item. They come in three sizes, and break when thrown!
tweak: Serving Trays can now be attached to belts, anticipating its increased usage.
rscadd: resprites brioche, Vanilla, and ChocolateStrawberry cakes
code: removed duplicate update of plane, when layer is already changed
/:cl:

@Tsar-Salat
Copy link
Contributor Author

i dont even think i fixed a quarter of the plates to not have the inbuilt plate sprites yet

gruh

Copy link

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

Copy link

github-actions bot commented May 7, 2024

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

Copy link

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

Copy link

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

Copy link
Member

@PowerfulBacon PowerfulBacon left a comment

Choose a reason for hiding this comment

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

The code seems good though

code/_onclick/hud/radial.dm Outdated Show resolved Hide resolved
code/_onclick/click.dm Outdated Show resolved Hide resolved
code/datums/components/storage/storage.dm Outdated Show resolved Hide resolved
Copy link

github-actions bot commented Sep 8, 2024

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

Copy link

github-actions bot commented Sep 8, 2024

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

Copy link
Member

@PowerfulBacon PowerfulBacon left a comment

Choose a reason for hiding this comment

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

Seems fine

@@ -242,7 +242,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
var/datum/radial_menu_choice/choice_datum = choice_datums[choice_id]
if (choice_datum.info)
var/obj/effect/abstract/info/info_button = new(E, choice_datum.info)
info_button.plane = ABOVE_HUD_PLANE
nfo_button.plane = ABOVE_HUD_PLANE
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
nfo_button.plane = ABOVE_HUD_PLANE
info_button.plane = ABOVE_HUD_PLANE

@Rukofamicom
Copy link
Contributor

Rukofamicom commented Sep 9, 2024

Woo \o/

Now I just need to add them to service Borgs

@PowerfulBacon PowerfulBacon added this pull request to the merge queue Sep 9, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 9, 2024
@PowerfulBacon PowerfulBacon added this pull request to the merge queue Sep 9, 2024
Merged via the queue into BeeStation:master with commit 8760143 Sep 9, 2024
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants