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

Adds a new traitor item for mime: poisoned rose #9724

Merged
merged 8 commits into from
Oct 16, 2022

Conversation

TobleroneSwordfish
Copy link
Contributor

[FEATURE] [BALANCE] [INPUT WANTED]

About the PR

Adds a 4TC mime specific traitor item: a rose that when held to someone's face mutes them for 40 seconds and adds a small amount of capulettium to their system (just enough to knock them out briefly).
If used on a mime it adds capulettium plus instead and gives them pseudonecrosis for a short time to allow for dramatic fake deaths.
The effect is blocked by wearing a helmet and will not reapply capulettium if the target already has it in their system or is incapacitated.
The effect also activates when someone pricks themselves trying to pick up the rose without gloves on.
Also adds the ability to hold roses in general to someone's face to let them smell the rose.
Balance may be completely off, let me know what you think/if this is just a very bad idea.

Why's this needed?

Mime has no traitor items due to being a latejoin role and is a latejoin role because (among other things) it has no traitor items. Let's fix that.
When I googled mime half of them were holding roses so it seems to be a thing, and a poisoned rose seems very theatrical.
Also it's not mime magic yay.

Changelog

(u)LeahTheTech
(*)Added a new traitor item for mimes: a poisoned rose.
(+)The poisoned rose temporarily mutes anyone who smells it and adds a small amount of capulettium to their system.

@keywordlabeler keywordlabeler bot added C-Balance Balance changes, buffs and nerfs 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. labels Jul 17, 2022
@github-actions github-actions bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 17, 2022
@github-actions
Copy link
Contributor

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

@github-actions github-actions bot added S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict and removed S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict labels Jul 18, 2022
@ZeWaka ZeWaka added the E-Freeze-Exempt🧊 Exempt from the current feature freeze label Jul 31, 2022
@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 Aug 2, 2022
@TobleroneSwordfish TobleroneSwordfish removed the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Aug 2, 2022
@ZeWaka ZeWaka added the A-Game-Objects The point of this PR is to deal with a specific game object label Aug 10, 2022
@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 Aug 23, 2022
@boring-cyborg boring-cyborg bot added A-Mapping A mapping change A-Tooling Changes tooling for the repository. C-Sprites Automatically applied on any .dmi or icons folder change labels Aug 23, 2022
@TobleroneSwordfish
Copy link
Contributor Author

oh what the hell

@github-actions github-actions bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 23, 2022
@github-actions github-actions bot removed the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Aug 23, 2022
@TobleroneSwordfish
Copy link
Contributor Author

history rewritten, everything is fine, no evidence of broken git config here

@github-actions github-actions bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 23, 2022
@TobleroneSwordfish TobleroneSwordfish removed A-Mapping A mapping change C-Sprites Automatically applied on any .dmi or icons folder change A-Tooling Changes tooling for the repository. labels Aug 23, 2022
@Sord213
Copy link
Contributor

Sord213 commented Aug 24, 2022

:screm:

@Sord213 Sord213 removed their request for review August 24, 2022 14:28
@TobleroneSwordfish TobleroneSwordfish removed the request for review from ZeWaka August 25, 2022 03:53
@TobleroneSwordfish
Copy link
Contributor Author

:screm:

sowwy sord, I did a git

@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 Aug 31, 2022
@TobleroneSwordfish TobleroneSwordfish removed the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Sep 1, 2022
@github-actions
Copy link
Contributor

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 Sep 16, 2022
@github-actions github-actions bot closed this Sep 24, 2022
@TobleroneSwordfish
Copy link
Contributor Author

Okay I'm reopening this because it never got reviewed 💀

code/obj/item/plants.dm Outdated Show resolved Hide resolved
code/obj/item/plants.dm Show resolved Hide resolved
code/obj/item/plants.dm Outdated Show resolved Hide resolved
Co-authored-by: frawhst <67879783+frawhst@users.noreply.github.com>
Co-authored-by: frawhst <67879783+frawhst@users.noreply.github.com>
@frawhst frawhst removed the S-Stale An inactive PR that has had no updates in the past two weeks label Oct 16, 2022
@frawhst frawhst merged commit c198c7e into goonstation:master Oct 16, 2022
github-actions bot pushed a commit that referenced this pull request Oct 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Game-Objects The point of this PR is to deal with a specific game object C-Balance Balance changes, buffs and nerfs C-Feature A new feature or enhancements to existing features E-Freeze-Exempt🧊 Exempt from the current feature freeze E-Input-Wanted Input and feedback are wanted. Also posts a discussion thread on the forums. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants