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

Fully adpots previously ported bottle sprite and fixes reagent overlays #26962

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

Bm0n
Copy link
Contributor

@Bm0n Bm0n commented Oct 2, 2024

What Does This PR Do

Changes almost all bottles to the previously ported bottle new bottle sprite.

Removes the old r4407 bottles

Fixes bottle overlaying. Reagent overlays now actually appear on bottle sprites.

Adjusts beaker and bottle reagent overlaying to intervals of 20u. Previously an overlay state was not being used and overlays only changed in intervals of 25u, the modern sprites were made with intervals of 20u in mind.

Standardizes bottles to a volume of 50u. Note: This does not increase the amount of chemicals in a bottle, only the size of the container is increased.

Replaces the "reagent bottle" sprite with a new one based on the modern bottle.

Why It's Good For The Game

We ported a new bottle sprite not long ago but it isn't used that much and its overlays were completely broken.

After fixing the overlays I have chosen to switch all of the chemical bottles over to the new bottle sprite because it is in the 3/4 style and a lot better looking than the ancient r4407 bottles that we are currently using alongside the new bottle.

A unified look for bottles is much better than the chaotic one we have right now. It is as if someone was blindfolded and threw darts at a board to figure out which chemical gets what bottle sprite, it doesn't look good IMO and the old sprites are heavily dated.

I decided to keep the "reagent bottle" around and respite it to match the new bottle but with an amber hue and a darker reagent overlay. Reagent bottles are the bottles that spawn in reagent closets, they are simply fluff. Pictures of this sprite can be found below.

Finally, setting the generic bottle size to a volume of 50u makes the most sense to me and it works better with the fixed overlays. Right now you can produce an infinite amount of 50u sized bottles at any chem master, it makes no sense that bottles bought at a medical vendor are 30u in size despite sharing the same sprite and name as those produced at chem masters.

Do keep in mind this is not changing the amount of chemicals you get per bottle at a medical vendor, only the maximum amount of chemicals a bottle can hold is changed

Images of changes

pr1

pr2

Testing

I spawned myself in and tested every reagent overlay state for each bottle and beaker


Declaration

  • I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

Changelog

🆑 Bmon
add: Changed most chemical bottle sprites over to the recently added version.
imageadd: Added a new sprite for reagent bottles.
imagedel: Removed old r4407 bottles.
tweak: All bottles now have a generic size of 50u.
fix: Bottle and beaker overlaying fixed.
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally Sprites This PR modifies the game sprites labels Oct 2, 2024
@silverplatedelta silverplatedelta added the Fix This PR will fix an issue in the game label Oct 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting type assignment This PR is waiting for its type to be assigned internally Fix This PR will fix an issue in the game Sprites This PR modifies the game sprites
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants