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.

Sign up for GitHub

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

Jump to bottom

Pomegranate & Aphrodisiacs #23

Merged
merged 15 commits into from
Jul 13, 2024
Merged

Pomegranate & Aphrodisiacs #23

merged 15 commits into from
Jul 13, 2024

Conversation

SleepyScarecrow
Copy link
Contributor

@SleepyScarecrow SleepyScarecrow commented Jul 13, 2024 •
edited
Loading

Description

I've added in a new fruit and thee new reagents, this involved Pomegranates, and 3 aphrodisiac drugs. These have no actual effect other than OD punishment, and instead stand as an RP-based drug, a la the antidepressants in Delta-V. I'm sure the ERPers among us will enjoy the addition.

TODO

  • Make Pomegranate more fleshed out; dishes,
  • Additions

Changelog

🆑 SleepyScarecrow

  • add: Added pomegranates and three new drugs

@github-actions github-actions bot added Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Jul 13, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 13, 2024 •
edited
Loading

RSI Diff Bot; head commit f57772e merging into b377e65
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi

State Old New Status
dead Added
harvest Added
produce Added
seed Added
stage-1 Added
stage-2 Added
stage-3 Added
stage-4 Added
stage-5 Added
stage-6 Added

Edit: diff updated after f57772e

@github-actions github-actions bot added Status: Needs Review Someone please review this labels Jul 13, 2024
FoxxoTrystan
FoxxoTrystan requested changes Jul 13, 2024
View reviewed changes
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

Overall good first PR, tho how would peoples know how to make the chems?
Mouth to ears or you want it listed on the documentation?

Good use of "Floofstation" folders, make sure to add comments on changes that are not in those folders.

Also i recomend to speak with "Lorelai Barker" on discord as he wanted to make Aphrodesiac, tho your current method seem the best way to do it honestly (please dont make it atmos gas)

Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Hydroponics/seeds.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml Outdated Show resolved Hide resolved
Resources/ServerInfo/Guidebook/Medical/Botanicals.xml Outdated Show resolved Hide resolved
Resources/Textures/Objects/Specific/Hydroponics/apple.rsi.zip Outdated Show resolved Hide resolved
@FoxxoTrystan FoxxoTrystan added Status: Awaiting Changes Do not merge due to requested changes and removed Status: Needs Review Someone please review this labels Jul 13, 2024
@SleepyScarecrow
Copy link
Contributor Author

Overall good first PR, tho how would peoples know how to make the chems? Mouth to ears or you want it listed on the documentation?

Good use of "Floofstation" folders, make sure to add comments on changes that are not in those folders.

Also i recomend to speak with "Lorelai Barker" on discord as he wanted to make Aphrodesiac, tho your current method seem the best way to do it honestly (please dont make it atmos gas)

Lorelai Inspired this, If they want gas they can use the foam mechanics. The documentation is already updated, at least in the guide itself, in the 'Chemicals' section.

@FoxxoTrystan
Copy link
Collaborator

Overall good first PR, tho how would peoples know how to make the chems? Mouth to ears or you want it listed on the documentation?
Good use of "Floofstation" folders, make sure to add comments on changes that are not in those folders.
Also i recomend to speak with "Lorelai Barker" on discord as he wanted to make Aphrodesiac, tho your current method seem the best way to do it honestly (please dont make it atmos gas)

Lorelai Inspired this, If they want gas they can use the foam mechanics. The documentation is already updated, at least in the guide itself, in the 'Chemicals' section.

Oh, guide auto-generate itself? good.
Take a look at changes needed please still.

@FoxxoTrystan FoxxoTrystan added the Priority: 2-Medium Needs to be resolved at some point label Jul 13, 2024
SleepyScarecrow and others added 7 commits July 13, 2024 15:31
@SleepyScarecrow @FoxxoTrystan
Update Resources/Prototypes/Entities/Objects/Specific/Hydroponics/see…
70a23e0 
…ds.yml

Co-authored-by: FoxxoTrystan <[email protected]>
@SleepyScarecrow @FoxxoTrystan
Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
03b7a45 
Co-authored-by: FoxxoTrystan <[email protected]>
@SleepyScarecrow @FoxxoTrystan
Update Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds…
fcf0daa 
….yml

Co-authored-by: FoxxoTrystan <[email protected]>
@SleepyScarecrow @FoxxoTrystan
Update Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Dri…
78e317d 
…nks/food_produce.yml

Co-authored-by: FoxxoTrystan <[email protected]>
@SleepyScarecrow @FoxxoTrystan
Update Resources/Prototypes/Hydroponics/seeds.yml
e384d5f 
Co-authored-by: FoxxoTrystan <[email protected]>
@SleepyScarecrow @FoxxoTrystan
Update Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Ran…
8b6d50b 
…dom/seeds.yml

Co-authored-by: FoxxoTrystan <[email protected]>
@SleepyScarecrow @FoxxoTrystan
Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mai…
f581fc8 
…l/mail_civilian.yml

Co-authored-by: FoxxoTrystan <[email protected]>
@SleepyScarecrow
Copy link
Contributor Author

Overall good first PR, tho how would peoples know how to make the chems? Mouth to ears or you want it listed on the documentation?
Good use of "Floofstation" folders, make sure to add comments on changes that are not in those folders.
Also i recomend to speak with "Lorelai Barker" on discord as he wanted to make Aphrodesiac, tho your current method seem the best way to do it honestly (please dont make it atmos gas)

Lorelai Inspired this, If they want gas they can use the foam mechanics. The documentation is already updated, at least in the guide itself, in the 'Chemicals' section.

Oh, guide auto-generate itself? good. Take a look at changes needed please still.

Yes it did, and changes approved, thanks for pointing them out-- I'll try to tag those next time.

FoxxoTrystan
FoxxoTrystan requested changes Jul 13, 2024
View reviewed changes
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

I will ask if you could move all the new textures and move it to the "Floof" directory.

"Resources/Textures/Floof"

This will make upsteam merge more easy and avoid overriding your changes.

FoxxoTrystan
FoxxoTrystan requested changes Jul 13, 2024
View reviewed changes
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Hydroponics/seeds.yml Outdated Show resolved Hide resolved
Resources/Textures/Floof/pomegranate.rsi/dead.png Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

Duplicate

Resources/Textures/Floof/pomegranate.rsi/harvest.png Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

Duplicate

Resources/Textures/Floof/pomegranate.rsi/stage-2.png Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

Duplicate

Resources/Textures/Floof/pomegranate.rsi/stage-3.png Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

Duplicate

Resources/Textures/Floof/pomegranate.rsi/stage-4.png Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

Duplicate

Resources/Textures/Floof/pomegranate.rsi/stage-5.png Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

Duplicate

Resources/Textures/Floof/pomegranate.rsi/stage-6.png Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

Duplicate

@FoxxoTrystan FoxxoTrystan removed the Status: Awaiting Changes Do not merge due to requested changes label Jul 13, 2024
@FoxxoTrystan FoxxoTrystan merged commit ccd5c10 into Fansana:master Jul 13, 2024
11 of 12 checks passed
@Floof-Station-Bot Floof-Station-Bot changed the title pomegranate & aphrodisiacs Pomegranate & Aphrodisiacs Jul 16, 2024
Floof-Station-Bot added a commit that referenced this pull request Jul 16, 2024
@Floof-Station-Bot
Automatic Changelog Update (#23)
2196c63
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Fansana Fansana Fansana approved these changes

@FoxxoTrystan FoxxoTrystan FoxxoTrystan approved these changes

Assignees

@SleepyScarecrow SleepyScarecrow

Labels
Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 2-Medium Needs to be resolved at some point
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@SleepyScarecrow @FoxxoTrystan @Fansana