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

Regular lube slides instead of throwing #6829

Closed
wants to merge 8 commits into from

Conversation

pali6
Copy link
Member

@pali6 pali6 commented Nov 29, 2021

About the PR

QQwWK3QAFa.mp4

Currently regular lube throws you and the organic superlubricant also throws you but deals brute damage to you on top of that.
This PR proposes a change that makes regular space lube slide you in the direction you are moving and removing the brute damage from the organic superlubricant. The invisible lube contained in the Slip-n-Sign janitor traitor item retains its damage.

Why's this needed?

Honestly I just thought that way to make people slide like this could be lead to more interesting interactions than the current lube. Also regular space lube and organic superlubricant are currently too similar, this would make a neat distinction between them imo. But also I'm genuinely not certain if this is a good change or not so please let me know what you think.

Changelog

(u)pali
(*)Space lube now gently slides people instead of straight up throwing them. Organic superlubricant now no longer deals additional damage on top of the one dealt by the lube-slip-throw.

@pali6 pali6 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. labels Nov 29, 2021
@github-actions github-actions bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 29, 2021
@github-actions
Copy link
Contributor

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

@pali6
Copy link
Member Author

pali6 commented Dec 4, 2021

Now emagged cleanbots and cleanbot mobcritters use superlube.
Also now trying to fight slip direction makes you fall over.

@pali6
Copy link
Member Author

pali6 commented Dec 4, 2021

Also regular lube now lasts longer.

@pali6 pali6 added the E-DNM [Dev Only] Do Not Merge - can only be removed by the applier or with their explicit permission. label Dec 4, 2021
@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 Dec 19, 2021
@pali6 pali6 removed the S-Stale An inactive PR that has had no updates in the past two weeks label Dec 19, 2021
@github-actions
Copy link
Contributor

github-actions bot commented Jan 3, 2022

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 Jan 3, 2022
@frawhst frawhst 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 Jan 5, 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 Feb 14, 2022
@pali6
Copy link
Member Author

pali6 commented Feb 28, 2022

!merge_upstream

@pali6 pali6 closed this Apr 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-Feature A new feature or enhancements to existing features E-Certified-Organic Will not be marked stale. E-DNM [Dev Only] Do Not Merge - can only be removed by the applier or with their explicit permission. 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 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.

None yet

3 participants