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] Dynamic material colors applied for insertion animation into lathes #2384

Merged
merged 1 commit into from
Mar 13, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1412
Original PR: tgstation/tgstation#81692

About The Pull Request

So you've noticed that when we insert say uranium into a techfab it shows us the proper green sheet getting consumed as the animation but when you insert that same uranium into an autolathe is shows us a blue sheet animation instead?

Yup not realistic, this is because the autolathe has only 2 animation types one for inserting iron & the other for glass. Every material type would have to share these 2 animations making it look bland.

Now the material color is blended on the icon itself allowing for the right color to be applied on the insertion animation

Plus this also trims the sizes of our dmi files so it's a win overall

Insertions.mp4

Changelog

🆑 SyncIt21
fix: inserting a material sheet into an lathes should show the correct animation color
/:cl:

… lathes (#1412)

* Dynamic material colors applied for insertion animation into lathes (#81692)

## About The Pull Request
So you've noticed that when we insert say uranium into a techfab it
shows us the proper green sheet getting consumed as the animation but
when you insert that same uranium into an autolathe is shows us a blue
sheet animation instead?

Yup not realistic, this is because the autolathe has only 2 animation
types one for inserting iron & the other for glass. Every material type
would have to share these 2 animations making it look bland.

Now the material color is blended on the icon itself allowing for the
right color to be applied on the insertion animation

Plus this also trims the sizes of our dmi files so it's a win overall


https://github.com/tgstation/tgstation/assets/110812394/bb643691-8d3b-4822-8371-346c2d5e5be3

## Changelog
:cl:
fix: inserting a material sheet into an lathes should show the correct
animation color
/:cl:

* Dynamic material colors applied for insertion animation into lathes

---------

Co-authored-by: SyncIt21 <[email protected]>
@ReezeBL ReezeBL merged commit ef793f6 into master Mar 13, 2024
24 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-1412 branch March 13, 2024 08:28
AnywayFarus added a commit that referenced this pull request Mar 13, 2024
Iajret pushed a commit that referenced this pull request May 8, 2024
…le and jawed hook to the market. (#2384)

* Unit test for black market items. Added missing bulwark module and jawed hook to the market. (#82972)

## About The Pull Request
Jacq has come up with the suggestion of adding a unit test to the
blackmarket. I agreed ~~and I think I deserve the NO GBP label because
both of these missing items are actually my fault~~.

## Why It's Good For The Game
Let's avoid issues like this in the future.

## Changelog

:cl:
fix: Added the missing bulwark MOD module and the jawed fishing hook to
the black market.
/:cl:

* Unit test for black market items. Added missing bulwark module and jawed hook to the market.

---------

Co-authored-by: Ghom <[email protected]>
ReezeBL pushed a commit that referenced this pull request May 9, 2024
…le and jawed hook to the market. (#2384) (#3239)

* Unit test for black market items. Added missing bulwark module and jawed hook to the market. (#82972)

## About The Pull Request
Jacq has come up with the suggestion of adding a unit test to the
blackmarket. I agreed ~~and I think I deserve the NO GBP label because
both of these missing items are actually my fault~~.

## Why It's Good For The Game
Let's avoid issues like this in the future.

## Changelog

:cl:
fix: Added the missing bulwark MOD module and the jawed fishing hook to
the black market.
/:cl:

* Unit test for black market items. Added missing bulwark module and jawed hook to the market.

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: Ghom <[email protected]>
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