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

stun and telebaton rework #18127

Merged
merged 9 commits into from
Jul 6, 2022
Merged

stun and telebaton rework #18127

merged 9 commits into from
Jul 6, 2022

Conversation

hal9000PR
Copy link
Member

@hal9000PR hal9000PR commented Jun 28, 2022

What Does This PR Do

stun batons:

  • 60 stamina damage, crit in 2 hits, or 1 hit + 2 disabler shots
  • confuse for 10 seconds
  • knockdown (force crawling) for 10 seconds, instead of a 14 second stun, after a delay of 2.5 seconds
  • have a cooldown of 3.5 Seconds between swings if you stun someone with a swing. (this cooldown is shared between all stunbatons to prevent people hot swapping batons to insta stun)
  • throwing the baton now has no RNG chance to stun

stunprods:

  • 40 stam damage, crit in 3 hits
  • knockdown for 6 seconds, instead of the stunbatons 10
  • all other changes are the same

telescopic/ "classic" police batons/ NT rep cane, ETC.

  • force crawling for 6 seconds
  • 30 stamina damage, affected by melee armour of the chest

contractor baton:

  • stam damage is the same, not affected by armour
  • the short stun at the start is replaced by a slightly longer duration of crawling

Why It's Good For The Game

combat ending in a single click is unfun. most of these changes have existed in the crawling PR with great feedback from the general community.

Changelog

🆑
tweak: stun batons now do stamina damage and force the target to crawl after a brief delay. hitting them twice will stop them from moving. stunprods do the same, but they need 3 hits to stop them,
tweak: telescopic/classic/NT rep cane now cause knockdown and stamina, affected by armour
tweak: contractor batons short stun is replaced by a slightly longer crawl.
tweak: throwing batons no longer stuns.
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally label Jun 28, 2022
@KittyNoodle
Copy link
Contributor

KittyNoodle commented Jun 28, 2022

contractor baton should stun, contactor is already hard enough and the baton should be better than a stun baton

@AffectedArc07 AffectedArc07 added the Balance This PR will modify how effective something is or isnt label Jun 28, 2022
@hal9000PR
Copy link
Member Author

contractor baton should stun, contactor is already hard enough and the baton should be better than a stun baton

it already is better than the stun baton. it has no delay to the force crawling and its cooldown is lower between swings.

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Jun 28, 2022
@Qwertytoforty
Copy link
Contributor

I would suggest that the telebatons actually deal 30-40 stamina when used, so you can actually potenially deal with someone as a head of staff / detective, rather than having to run away. Security can often be busy, and not able to deal with demotions / removal of people in reasonable amounts of time. RD / CMO should not have to wait 2 minutes for sec to come to get the clown out of scichem / virology / wherever else.

@TrashDoxx
Copy link
Contributor

TrashDoxx commented Jun 28, 2022

Too weak nerf. You are capable of more.

@MRgaty
Copy link

MRgaty commented Jun 29, 2022

What I fear the most is having this merged but keeping the stupid RNG disarm. The lucky click could end any of your attempts to kidnap someone if you need to land 3 hits on them

@ParadiseSS13-Bot ParadiseSS13-Bot added the Testmerge Requested This PR has a pending testmerge request label Jun 30, 2022
@hal9000PR
Copy link
Member Author

Batons now do stamina. OP editted.

@hal9000PR hal9000PR marked this pull request as ready for review June 30, 2022 17:12
@hal9000PR hal9000PR changed the title [DNM] stun and telebaton rework stun and telebaton rework Jun 30, 2022
@ParadiseSS13-Bot ParadiseSS13-Bot added the Testmerge Active This PR is currently testmerged on production label Jun 30, 2022
@Mitchs98
Copy link
Contributor

Mitchs98 commented Jul 2, 2022

Unsure if this is intended; With this PR when using a baton it puts ALL actions on cooldown. Not just using the baton. When trying to baton someone and swap to cuffs I had to wait for the entire baton cooldown. I don't think this is intended, and if it is...why?

@hal9000PR
Copy link
Member Author

Unsure if this is intended; With this PR when using a baton it puts ALL actions on cooldown. Not just using the baton. When trying to baton someone and swap to cuffs I had to wait for the entire baton cooldown. I don't think this is intended, and if it is...why?

not necessarily intended, but it is intended to put other things on cooldown, that way you cannot switch to another baton instantly or a disabler instantly to stun them instantly.

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting approval This PR is waiting for approval internally Testmerge Requested This PR has a pending testmerge request labels Jul 2, 2022
@Inadvizable
Copy link
Contributor

Having played several security shifts, I must say stunprods might be a bit undertuned. They are basically not a threat, I just win with my baton. Even when surprised.

Copy link
Member

@farie82 farie82 left a comment

Choose a reason for hiding this comment

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

LGTM

@farie82 farie82 merged commit 3980f2d into ParadiseSS13:master Jul 6, 2022
github-actions bot added a commit that referenced this pull request Jul 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting review This PR is awaiting review from the review team Balance This PR will modify how effective something is or isnt Testmerge Active This PR is currently testmerged on production
Projects
None yet
Development

Successfully merging this pull request may close these issues.