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

Ports Condiment Sprites from TG. Ports Mayonnaise, Peanut Butter, Olives, and Olive Oil from TG #22796

Merged
merged 9 commits into from
Oct 12, 2023

Conversation

Mitchs98
Copy link
Contributor

@Mitchs98 Mitchs98 commented Oct 9, 2023

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

dreammaker_ZdlDtEqN3d

dreammaker_9p7wkcbeeY

newthings

Testing

  1. Spawned in each and every condiment bottle.
  2. Filled condiment bottles with their respective condiments.
  3. Grew an Olive tree, cried at the offsetting, and properly offset it by the needed amount.
  4. Harvested Olives.
  5. Ground Olives and Peanut Butter.
  6. Mixed Olive Oil.
  7. Mixed Mayonnaise.
  8. Ate the Mayonnaise.
  9. Drank the excess Olive Oil.

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:

@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 9, 2023
@SynthTwo
Copy link
Contributor

SynthTwo commented Oct 9, 2023

YES LETS GOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO

@Henri215 Henri215 added the Requires Wiki Update Useful for Wiki Contributers to search for things that need updating label Oct 9, 2023
code/modules/food_and_drinks/food/condiment.dm Outdated Show resolved Hide resolved
code/modules/food_and_drinks/food/condiment.dm Outdated Show resolved Hide resolved
code/modules/hydroponics/grown/olive.dm Outdated Show resolved Hide resolved
@Carthusia
Copy link

It never dawned on me till now...but we dont have mustard

@Mitchs98
Copy link
Contributor Author

Mitchs98 commented Oct 9, 2023

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.

It never dawned on me till now...but we dont have mustard

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.

@farie82 farie82 added the Feature This PR is a new addition to the game label Oct 9, 2023
@DT2399
Copy link

DT2399 commented Oct 9, 2023

YES!!

@Mitchs98
Copy link
Contributor Author

Mitchs98 commented Oct 9, 2023

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.

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Oct 9, 2023
@Migratingcocofruit
Copy link
Contributor

A small cylindrical salty fruit

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.

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting approval This PR is waiting for approval internally labels Oct 9, 2023
@Probablyjay19
Copy link
Contributor

Can I use mayonnaise as an instrument?

Copy link
Member

@Henri215 Henri215 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
Remove that duplicate sprite

@Mitchs98
Copy link
Contributor Author

Mitchs98 commented Oct 9, 2023

image Remove that duplicate sprite

I did. THat's just a reference picture :p

EDIT: What the hecc I guess it isn't my bad.

@Mitchs98
Copy link
Contributor Author

Can I use mayonnaise as an instrument?

Perhaps soon.

@Mitchs98
Copy link
Contributor Author

Mitchs98 commented Oct 10, 2023

A small cylindrical salty fruit

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.

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.

@Migratingcocofruit
Copy link
Contributor

A small cylindrical salty fruit

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.

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

@Mitchs98
Copy link
Contributor Author

Mitchs98 commented Oct 10, 2023

A small cylindrical salty fruit

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.

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.

@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Oct 10, 2023
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Oct 11, 2023
@S34NW S34NW merged commit 2e86088 into ParadiseSS13:master Oct 12, 2023
15 checks passed
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Oct 12, 2023
@Mitchs98 Mitchs98 deleted the condiments branch October 12, 2023 18:51
BR54FF pushed a commit to BR54FF/Paradise-SS220 that referenced this pull request Oct 17, 2023
…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
BR54FF pushed a commit to BR54FF/Paradise-SS220 that referenced this pull request Oct 23, 2023
…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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge Feature This PR is a new addition to the game Requires Wiki Update Useful for Wiki Contributers to search for things that need updating Sprites This PR modifies the game sprites
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants