forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 170
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
[Port] Chemmaster refactor #1644
Merged
dwasint
merged 19 commits into
Monkestation:master
from
AlbertNanotracen:chemmaster-refactor
Jun 24, 2024
Merged
[Port] Chemmaster refactor #1644
dwasint
merged 19 commits into
Monkestation:master
from
AlbertNanotracen:chemmaster-refactor
Jun 24, 2024
Commits on Apr 12, 2024
-
ChemMaster and CondiMaster refactored, prints items over time (tgstat…
…ion#75849) ![ZceBfkJaFG](https://github.com/tgstation/tgstation/assets/3625094/aedf6178-dad7-40b2-a7ea-18da6f56e9e8) Chem master has been using some hard coded styles for containers, pills and patches. Some people didn't bother to update styles, and they stayed outdated. Now it uses just a list of reagent containers instead, which makes it easy to add new containers - just one line of code. Also changed its sprite for better animations, emissive overlay, and to display buffer reagents on the sprite itself. Now it plays printing animation when you actually print containers and servos have a purpose now - they increase the amount of containers printed at once by up to 100% * part_tier. Pills and patches are always printed at double amount. And fixes tgstation#59734 Makes chem master easier to manage in code and easier to use in-game. Printing delay is added for consistency with other fabrication machines (like lathes), to give a purpose for the servo motor used in construction, for visuals (to show the printing animation only when something is being printed, and not just when you move stuff in and out of buffer as before) and to prevent people from spamming the world with unneeded objects with 0 second delay. :cl: qol: Chemmaster UI tweaked fix: Fixed chem master showing wrong data during reagent analysis fix: Fixed chem master not working with fermented drinks image: Chemmaster resprited, now has an indicator for buffer reagents refactor: Refactored chemmaster code, it now uses reagent containers instead of styles balance: Chemmaster now uses servos and has printing animation of 0.75 second duration. Outputs 1 container or up to 2 pills/patches per cycle by default. Can be upgraded to output up to 4 and 8 with t4 servos. /:cl:
Configuration menu - View commit details
-
Copy full SHA for 33a4b99 - Browse repository at this point
Copy the full SHA 33a4b99View commit details -
Condiments resprited (tgstation#75715)
![image](https://github.com/tgstation/tgstation/assets/3625094/021a6d6e-6f25-40e1-8c1a-6cebb25e7614) Resprited many condiment containers. And a tray (don't know why, it just was in the dmi) Replaced the old condiment bottle from Condi Master with the one that was used in Chem Master before the test tubes. More in line with other 3/4 stuff :cl: image: Resprited many condiment containers image: Added a sprite for cooking oil / corn oil container image: Replaced old condiment bottles with the newer bottles in Condi Master /:cl:
Configuration menu - View commit details
-
Copy full SHA for c42d898 - Browse repository at this point
Copy the full SHA c42d898View commit details -
Test tubes and racks (tgstation#75179)
![image](https://user-images.githubusercontent.com/3625094/236466928-dd7beffb-ff26-4d78-a10b-7be29aae56f2.png) Bottles have varied volumes - some of them hold 30, some 50, while having the same sprite. And the size is comparable with small beaker, so it was a bit weird that it can hold only 30 units. Now the default bottle volume is 50, consistently. Test tubes are the new 30u container that replaces bottles created in chem master (but not condi master) and pandemic. For better management of test tubes, this PR also adds a rack that can be crafted from 1 wooden plank. The rack stores up to 10 test tubes and can pick them up and drop quickly similar to how the pill bottle works with pills. ![image](https://user-images.githubusercontent.com/3625094/236472298-df4932a4-4620-4a6b-87c0-67efc7317d02.png) Consistent volume for the bottle sprite instead of some being 30, some 50. Essential attribute for chemical lab, good company for Chem Separator. :cl: MTandi, coiledlamb add: Added test tubes and racks for them balance: All 30u bottles now have 50u volume and chem master/pandemic spawn tubes instead of bottles /:cl:
Configuration menu - View commit details
-
Copy full SHA for ac94572 - Browse repository at this point
Copy the full SHA ac94572View commit details -
Configuration menu - View commit details
-
Copy full SHA for 959ef93 - Browse repository at this point
Copy the full SHA 959ef93View commit details -
Configuration menu - View commit details
-
Copy full SHA for d30d9fa - Browse repository at this point
Copy the full SHA d30d9faView commit details
Commits on Apr 13, 2024
-
Configuration menu - View commit details
-
Copy full SHA for ce60fea - Browse repository at this point
Copy the full SHA ce60feaView commit details
Commits on Apr 16, 2024
-
Configuration menu - View commit details
-
Copy full SHA for d711a08 - Browse repository at this point
Copy the full SHA d711a08View commit details
Commits on Apr 27, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 97af5de - Browse repository at this point
Copy the full SHA 97af5deView commit details
Commits on May 7, 2024
-
Configuration menu - View commit details
-
Copy full SHA for b1106b1 - Browse repository at this point
Copy the full SHA b1106b1View commit details -
Configuration menu - View commit details
-
Copy full SHA for e2c2040 - Browse repository at this point
Copy the full SHA e2c2040View commit details
Commits on May 8, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 15e3d0e - Browse repository at this point
Copy the full SHA 15e3d0eView commit details
Commits on May 11, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 6ae6e15 - Browse repository at this point
Copy the full SHA 6ae6e15View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6842c0a - Browse repository at this point
Copy the full SHA 6842c0aView commit details -
Configuration menu - View commit details
-
Copy full SHA for d02e327 - Browse repository at this point
Copy the full SHA d02e327View commit details -
Configuration menu - View commit details
-
Copy full SHA for 343a7db - Browse repository at this point
Copy the full SHA 343a7dbView commit details
Commits on Jun 1, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 0e9dd8f - Browse repository at this point
Copy the full SHA 0e9dd8fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1d2f566 - Browse repository at this point
Copy the full SHA 1d2f566View commit details
Commits on Jun 22, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 89a1bc5 - Browse repository at this point
Copy the full SHA 89a1bc5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2356e46 - Browse repository at this point
Copy the full SHA 2356e46View commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.