-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Ports Condiment Sprites from TG. Ports Mayonnaise, Peanut Butter, Olives, and Olive Oil from TG #22796
Conversation
YES LETS GOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO |
It never dawned on me till now...but we dont have mustard |
Appended periods to stuff Henri mentioned(and a few more things he didn't see, teehee), also added spawnable bottles of the rest of the condiments because why not? Also finished pathing the honey and etc. on the condiments list because I forgor to do that surprised it compiled properly the first time and worked fine.
I honestly don't know any server that has mustard. I know TG doesn't, I was going to port it from there but it sadly doesn't exist. |
YES!! |
Ported TGs updated cleaver, looks much shinier and nicer than ours. Also removed the bloody cleaver that I didn't see used anywhere. PR Desc updated shortly. |
I know it's a port but considering this description is would make sense for it to have a small amount of salt as a reagent. |
Can I use mayonnaise as an instrument? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps soon. |
Missed this earlier. I'll consider doing that, wanted to try and avoid grinder bloat when trying to make oliveoil...but at the same time it would streamline making oliveoil a bit. I think I'll push an update for this later tonight. Olives will now have a bit of salt in them. |
The grinder has both grind and juice options. IIRC Grind gives the reagents and juice usually gives a reagent that is dependent on the plant. So you can make it give the mahsed olives on juice and the reagents on grind |
A juicing setting typically wouldn't produce paste, it would mulchify the olive into well...liquid. Going to keep it as is, really. |
…ves, and Olive Oil from TG (ParadiseSS13#22796) * sprites * Code Phase 1 * olives ur oil * grammars ur sentences * the hash slinging slasher * the trash thinging * salts ur olives * bottles ur wasabi
…ves, and Olive Oil from TG (ParadiseSS13#22796) * sprites * Code Phase 1 * olives ur oil * grammars ur sentences * the hash slinging slasher * the trash thinging * salts ur olives * bottles ur wasabi
What Does This PR Do
Freshens up our old condiment sprites from TG, as well as the serving tray(it was also in the same PR so why not). Also minorly refactors condiment bottle code, does not change any functionality.
tgstation/tgstation#74890 - Salt and Pepper Shaker by CoiledLamb.
tgstation/tgstation#75715 - Condiments by MTandi.
Adds updated empty condiment bottle, mixed condiment bottle, and wasabi tube by ATP Engineer
Mayonnaise is created with 5 egg, 1 salt, and 5 Olive Oil resulting in 10 Mayonnaise.
Olive Oil is created with 5 Olive Paste and 5 Water resulting in 10 Olive Oil.
Olive Paste is made by grinding up Olives.
Peanut Butter is created by grinding up Peanuts.
Why It's Good For The Game
Our current condiment sprites are, quite honestly, very bad. This PR aims to improve that while also adding a few new condiments that will be used in future recipes I intend on porting from TG. Essentially lays the groundwork and adds a new condiment, two if you count peanut butter. Also makes our serving tray look more like a serving tray and less like a baking tray.
Cleaver sprite is also updated to be more in line with our other sprites, ported from TG.
Images of changes
Testing
Changelog
🆑 Mitchs98, ATP Engineer, CoiledLamb, MTandi
add: Added Mayonnaise, created by mixing 5 egg, 1 salt, and 5 Olive Oil resulting in 10 units of Mayonnaise.
add: Adds Olive Oil and Olive Paste. Olive Oil is made from 5 Olive Paste and 5 Water, resulting in 10 units. Olive Paste is acquired by grinding olives.
add: Peanut Butter, Acquired by grinding Peanuts.
add: Olives, growable in botany. Mutates into nothing, provides Olive Paste when ground.
imageadd: Most Condiments have been given new sprites ported from TG.
imageadd: Ported updated Tray sprite from TG.
imageadd: Ports TG's Cleaver sprite.
imageadd: Condiment bottle, mixed condiment bottle, and Wasabi bottle by ATP Engineer.
/:cl: