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

Flowers: Rising #3710

Closed
wants to merge 22 commits into from
Closed

Flowers: Rising #3710

wants to merge 22 commits into from

Conversation

DimWhat
Copy link
Contributor

@DimWhat DimWhat commented Feb 13, 2021 •
edited by ZeWaka

[Feature] [Input Wanted]

About the PR

Planned to add several different flowers for botany to grow. Also making it so that all flowers are wearable. This should open up more flowers to be added in future PRs. This PR also reclassifies poppies as a flower instead of an herb!
image
image
image

Why's this needed?

Flowers are pretty and making more of them seems like it'll make more options for botanists to grow and experiment with. Sounds like a good time.

Credits

Hibiscus, Daffodil, and Blue Bonnet sprites by Jan.antilles
Morning glory worn and item sprites by Retrino
Daisy sprites by Nefarious

Changelog

(u)DimWhat
(*)Added 5 new flowers to botany. Sprites by Nefarious, Retrino and Jan.antilles. See the PR for specifics of who made what!
(+)Flowers can now be worn. Go ahead and feel pretty.

@DimWhat
testing stuff
6190f45
@DimWhat
makes swat mask reward tinted red
198adb7
@DimWhat
Ah dang wrong branch
5698056
@DimWhat
Merge branch 'mask-bug' into blossoming-flowers
d5c6fcc
@DimWhat
basic flower stuff
9479779
@DimWhat
upstream
7bce61d
@DimWhat
Merge branch 'master' of https://github.com/goonstation/goonstation
a8e1b77
@DimWhat
fixes my DME
4276e6f
@DimWhat
Merge branch 'master' of https://github.com/goonstation/goonstation
109b7b2
@DimWhat
pt. 2
e679df2
@DimWhat
Merge branch 'master' of https://github.com/goonstation/goonstation
8fb8e97
@DimWhat
Merge branch 'master' of https://github.com/goonstation/goonstation
9377c7c
@DimWhat
Merge branch 'master' of https://github.com/goonstation/goonstation
c2df2c8
@DimWhat
Merge branch 'master' of https://github.com/goonstation/goonstation
2096753
@DimWhat
Merge branch 'master' into blossoming-flowers
56dc7fd
@DimWhat
feh
ba6d40b
@DimWhat
comments + basic of flowers
fe74d54
@DimWhat
Merge branch 'master' into blossoming-flowers
f5e58ff
@DimWhat
removes dumb experiment
826ca9c
@DimWhat
fixing me being a goof
d3c6c6a
@DimWhat
small note to myself
9393618
@boring-cyborg boring-cyborg bot added the C-Sprites Automatically applied on any .dmi or icons folder change label Feb 13, 2021
@keywordlabeler keywordlabeler bot added C-Feature A new feature or enhancements to existing features E-Input-Wanted Input and feedback are wanted. Also posts a discussion thread on the forums. WIP labels Feb 13, 2021
@github-actions
Copy link
Contributor

Created discussion thread: https://forum.ss13.co/showthread.php?tid=15868

Azrun
Azrun reviewed Feb 14, 2021
View reviewed changes
code/obj/item/flowers.dm
..()

attackby(obj/item/W as obj, mob/user as mob)
if (istype(W, /obj/item/wirecutters/) && src.thorned)
Copy link
Contributor

Choose a reason for hiding this comment

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

Consider issnippingtool(W) for with scissors and Omnitool, unless you just want wire cutters. I see this wasn't a change you made but wanted to bring it up.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fair point, I'll make sure to use that when i get open VSC again to do some edits to this

@github-actions
Copy link
Contributor

github-actions bot commented Mar 1, 2021

This PR has been inactive for two weeks, and has been automatically marked as stale. This means it is at risk of being auto closed in another week. Please address any outstanding review items and ensure your PR is finished. If you are auto-staled anyway, ask developers if your PR will be merged. Once you have done any of the previous actions then you should request a developer remove the stale label on your PR, to reset the stale timer. If you feel no developer will respond in that time, you may wish to close this PR youself, while you seek developer comment, as you will then be able to reopen the PR yourself.

@github-actions github-actions bot added the S-Stale An inactive PR that has had no updates in the past two weeks label Mar 1, 2021
@Studenterhue Studenterhue added the E-Add-To-Wiki A PR that will require changes to the wiki label Mar 6, 2021
@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Mar 15, 2021
@github-actions github-actions bot closed this Mar 23, 2021
@Carbadox Carbadox reopened this Mar 23, 2021
@Carbadox Carbadox added E-Certified-Organic Will not be marked stale. and removed S-Stale An inactive PR that has had no updates in the past two weeks labels Mar 23, 2021
@ZeWaka ZeWaka removed E-Certified-Organic Will not be marked stale. WIP labels Apr 7, 2021
@ZeWaka
Copy link
Member

ZeWaka commented Apr 7, 2021

Feel free to re-open if you continue working on this.

@ZeWaka ZeWaka closed this Apr 7, 2021
@BatElite BatElite removed the E-Add-To-Wiki A PR that will require changes to the wiki label May 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Azrun Azrun Azrun left review comments

Assignees
No one assigned
Labels
C-Feature A new feature or enhancements to existing features C-Sprites Automatically applied on any .dmi or icons folder change E-Input-Wanted Input and feedback are wanted. Also posts a discussion thread on the forums. S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@DimWhat @ZeWaka @Azrun @Carbadox @BatElite @Studenterhue