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

Adds protein powder. #30

Merged
merged 23 commits into from
Jan 14, 2025
Merged

Adds protein powder. #30

merged 23 commits into from
Jan 14, 2025

Conversation

Constellado
Copy link
Collaborator

@Constellado Constellado commented Oct 9, 2024

About The Pull Request

Adds protein powder!
image

The two big containers has been sprited by me, and the small one comes from tgstation/tgstation#84235

It is orderable in cargo, you get two smalls and one big container for 300 credits. A steal!!

Why It's Good For The Game

New food options! It will be a buyable thing from the outpost! lots of protein and is a good meal replacement.

TODO:

  • more sprites.
  • make it an actual container in code.
  • make the powder in code.
  • make the drink in code.
  • add to cargo

OPTIONAL:

  • drink sprite when in a glass.

Changelog

🆑
add: Adds protein powder
/:cl:

@Constellado Constellado marked this pull request as ready for review December 14, 2024 06:35
@Constellado
Copy link
Collaborator Author

This is ready to merge, players have tested it and used it :)

Copy link
Contributor

github-actions bot commented Jan 8, 2025

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

@Constellado
Copy link
Collaborator Author

fuck

@Constellado
Copy link
Collaborator Author

ok NOW its good

@Ossa88 Ossa88 merged commit ffc7054 into PentestSS13:master Jan 14, 2025
13 checks passed
github-actions bot pushed a commit that referenced this pull request Jan 14, 2025
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