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

Rainbow Weed #25759

Merged
merged 15 commits into from
Apr 29, 2024
Merged

Rainbow Weed #25759

merged 15 commits into from
Apr 29, 2024

Conversation

potato1234x
Copy link
Contributor

@potato1234x potato1234x commented Mar 2, 2024 •
edited
Loading

About the PR

Adds rainbow weed.

You can get rainbow weed from mutating regular weed, it has 3 space drugs, 3, lipolicide, 2 mindbreaker toxin, 2 happiness, and 0.6 psicodine.

depends on #27134

Why / Balance

rainbow weed is a staple of the ss13 botanist, it was surprising we didnt have it already, mostly for rp purposes

Media

An example of creating rainbow smokes

Space.Station.14.2024-03-02.11-52-17_Trim.mp4

What all the reagents do together

Space.Station.14.2024-03-02.11-55-10_Trim.mp4
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog

🆑 Potato1234_x

  • add: Added rainbow weed. It is obtained by mutating regular weed.

@github-actions github-actions bot added the Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. label Mar 2, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 2, 2024 •
edited
Loading

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

Resources/Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi

State Old New Status
dead Added
dried Added
harvest Added
powderpile_rainbow Added
produce Added
seed Added
stage-1 Added
stage-2 Added
stage-3 Added

Edit: diff updated after 85d0624

@potato1234x
damn you notepad++
ba64d77
@potato1234x
fix
d524e16 
WHY NOT TELL ME ALL THE PROBLEMS AT THE SAME TIME!!!
@potato1234x
work
b04c9b4
@potato1234x
work i beg you
10f9609
@deltanedas
Copy link
Contributor

now require mannitol splashed on brain to put in mmi :trollface::trollface::trollface:

@potato1234x
Copy link
Contributor Author

sounds like a job for emogarbage :clueless:

@UbaserB
Copy link
Member

UbaserB commented Mar 2, 2024

  • happiness makes you high, makes you laugh and whistle but when OD'ed it makes you cry

can you make happiness craftable using laughter, space drugs and some other chemical

@potato1234x
Copy link
Contributor Author

its already craftable
image

@UbaserB
Copy link
Member

UbaserB commented Mar 2, 2024

its already craftable

then change the recipe to AT LEAST include laughter, or make it so that there is an alternative recipe along with this one which is easier to craft but requires botany to help (with the liquid laughter and all)

@potato1234x
Copy link
Contributor Author

might replace n2o with laughter

@UbaserB
Copy link
Member

UbaserB commented Mar 2, 2024

One more thing, Euphoria would sound cooler than happiness. After all, euphoria is the exhilarating feeling of happiness and kind of sounds cooler

@K-Dynamic
Copy link
Contributor

Psychologist rp - rainbow weed foam grenades for mass mental health vines :trollface:

@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Mar 22, 2024
@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Mar 23, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Mar 24, 2024
@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Mar 25, 2024
@mirrorcult
Copy link
Contributor

rainbow weed should be added separately from the reagents included here, i dont see them as necessarily relevant to eachother

mirrorcult
mirrorcult requested changes Apr 1, 2024
View reviewed changes
Copy link
Contributor

@mirrorcult mirrorcult left a comment

Choose a reason for hiding this comment

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

above

@potato1234x
Copy link
Contributor Author

Theyre all narcotic reagents, i dont see why they shouldnt be added with the weed...

@Partmedia
Copy link
Contributor

Per the reviewer feedback above and the PR guidelines, please separate unrelated changes to a separate PR or this PR may be closed.

@Partmedia Partmedia added the Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. label Apr 10, 2024
@potato1234x
Copy link
Contributor Author

potato1234x commented Apr 14, 2024 •
edited
Loading

Aight will do that soon, dont see how theyre unrelated tho since theyre obtained via the weed

@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Apr 18, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Apr 18, 2024
@potato1234x potato1234x mentioned this pull request Apr 19, 2024
Merged
1 task
@github-actions github-actions bot added No C# For things that don't need code. Status: Needs Review This PR requires new reviews before it can be merged. and removed Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. labels Apr 19, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Apr 22, 2024
@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Apr 22, 2024
@mirrorcult mirrorcult merged commit cd90c05 into space-wizards:master Apr 29, 2024
13 checks passed
@potato1234x potato1234x deleted the rainbow-weed branch April 29, 2024 07:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mirrorcult mirrorcult mirrorcult approved these changes

Assignees
No one assigned
Labels
Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. No C# For things that don't need code. Status: Needs Review This PR requires new reviews before it can be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@potato1234x @deltanedas @UbaserB @K-Dynamic @mirrorcult @Partmedia