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

[MIRROR] Fixes runtime in mat container chat display #1120

Merged
merged 2 commits into from
Dec 17, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25617
Original PR: tgstation/tgstation#80321

About The Pull Request

Forgot to format the chat in the right format when items are rejected by the mat container. Rather than displaying the item is rejected it would simply runtime & not display anything. That's fixed now

Changelog

🆑 SyncIt21
fix: items that are rejected by the mat container will display the chat message saying that.
/:cl:

…NORE] (#25617)

* [NO GBP] Fixes runtime in mat container chat display (#80321)

Forgot to format the chat in the right format when items are rejected by
the mat container. Rather than displaying the item is rejected it would
simply runtime & not display anything. That's fixed now

:cl:
fix: items that are rejected by the mat container will display the chat
message saying that.
/:cl:

* [NO GBP] Fixes runtime in mat container chat display

---------

Co-authored-by: SyncIt21 <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror Fix labels Dec 15, 2023
@Iajret Iajret merged commit d400912 into master Dec 17, 2023
22 checks passed
@Iajret Iajret deleted the upstream-mirror-25617 branch December 17, 2023 22:25
AnywayFarus added a commit that referenced this pull request Dec 17, 2023
Iajret pushed a commit that referenced this pull request Feb 25, 2024
* Meatwheat Made Consistent (#81639)

## About The Pull Request
Removes the GRAIN foodtype from meatwheat, it's just meat.
## Why It's Good For The Game
In the current iteration of meatwheat, it flip-flops between foodtypes
while you're preparing it.

First it's meat and wheat
![Screenshot 2024-02-22
212818](https://github.com/tgstation/tgstation/assets/73589390/3a4da0ef-9550-4551-8ec7-6057b93f4d8e)
then it's wheat
![Screenshot 2024-02-22
212854](https://github.com/tgstation/tgstation/assets/73589390/7bd07c16-503b-4ab3-8df8-6d99951c0429)
then it's meat!
![Screenshot 2024-02-22
212909](https://github.com/tgstation/tgstation/assets/73589390/0a570619-7ad4-4041-b887-8019b78a2e91)

This should JUST be meat, it's meatwheat not wheatwheat, and the
reagents don't hint towards it being wheat.
## Changelog
:cl:
fix: meatwheat is now firmly made out of meat, instead of sometimes
being wheat and sometimes being meat and sometimes being both.
/:cl:

* Meatwheat Made Consistent

---------

Co-authored-by: Cheshify <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants