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

Modernizes abductor Baton #27082

Merged
merged 8 commits into from
Nov 10, 2024

Conversation

silverplatedelta
Copy link
Contributor

What Does This PR Do

The abductor baton is now a 2 hit stun with knockdown on hit, comparable to the contractor baton. There is now a 2.5 second do-after to put someone to sleep. Cuff and probe modes were unchanged.

Why It's Good For The Game

This removes the last vestiges of old combat from our codebase, and brings the abductors inline with the combat system used by the rest of the game.

Testing

Bully a skrell. Ensure baton cannot be used by non-abductors.


Declaration

  • I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

image

Changelog

🆑
tweak: Abductor baton now takes 2 hits to stun, and 2.5 seconds to sleep.
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally label Oct 12, 2024
@SynthTwo
Copy link
Contributor

!wiki_label

@github-actions github-actions bot added the Requires Wiki Update Useful for Wiki Contributers to search for things that need updating label Oct 12, 2024
@Qwertytoforty
Copy link
Contributor

Qwertytoforty commented Oct 12, 2024

I do like it, but do still think that the baton doesn't need a do_after on sleeping.
Edit: with lack of baton cooldown, might be fine, will have to see how cns / heart takes it

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Oct 14, 2024
@Henri215 Henri215 added the Balance This PR will modify how effective something is or isnt label Oct 14, 2024
@silverplatedelta
Copy link
Contributor Author

Over balance/feat limit

Oop

@silverplatedelta
Copy link
Contributor Author

Open balance pr slot whoo

Copy link
Contributor

@lewcc lewcc left a comment

Choose a reason for hiding this comment

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

One small thing while you're here, LGTM otherwise.

code/game/gamemodes/miniantags/abduction/abduction_gear.dm Outdated Show resolved Hide resolved
@Henri215 Henri215 requested a review from Contrabang October 23, 2024 20:53
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Oct 25, 2024
Copy link
Contributor

@Contrabang Contrabang left a comment

Choose a reason for hiding this comment

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

Blind bot doesn't know what requested changes are smh

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting merge This PR is ready for merge labels Oct 28, 2024
Copy link
Contributor

@ErdGinalD ErdGinalD left a comment

Choose a reason for hiding this comment

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

CLGTM

@Daylight2
Copy link
Contributor

I was about to write a long comment about why this is bad, but after testing it out, it's.. fine. The baton doesn't have the extra attack cooldown the contractor baton and stunbaton have, meaning you can hit your target again (almost) immediately. Combined with the knockdown, you can still have someone fully stunned in less than a second without getting your face blown off by a shotgun, and the sleep delay isn't really long enough for someone to accurately call for help.

If either of those were changed, I'd say that this was too big a nerf for an antag that's fine balance wise, but right now this doesn't really change their playstyle that much.

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Nov 4, 2024
Copy link
Contributor

@Contrabang Contrabang left a comment

Choose a reason for hiding this comment

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

one last thing

code/game/gamemodes/miniantags/abduction/abduction_gear.dm Outdated Show resolved Hide resolved
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting merge This PR is ready for merge labels Nov 5, 2024
@Burzah Burzah added this pull request to the merge queue Nov 10, 2024
Merged via the queue into ParadiseSS13:master with commit 28edf95 Nov 10, 2024
12 checks passed
@silverplatedelta silverplatedelta deleted the AbductorsModernization branch December 1, 2024 16:50
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 Requires Wiki Update Useful for Wiki Contributers to search for things that need updating
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants