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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makes cult spear not an instant stun. #19343

Merged
merged 3 commits into from
Nov 2, 2022

Conversation

Qwertytoforty
Copy link
Contributor

What Does This PR Do

Cult spear no longer instant stuns and does 40 damage.

It now does 30 damage, and marks a person similar to cult spell. If it hits a person who was cult marked, it will trigger the stun.

Recall of the spear has been improved, and will hit threats on the way back that are lying down, or go into a knocked down cultist hand.

Why It's Good For The Game

A 6 second instant stun is not great. A cult knockdown spell / mark trigger is much better,

Recall is good if you miss a throw, or as a trap, but could use a bit of help. Adding undodgeable to the throw flag on recall means it will go into the hand more consistently, or can be used to trigger marks, if you want to give up the 150 blood spear.

Testing

Spawned in.
Confirmed damage was correct
Confirmed it marked on hit.
Confirmed recall worked on user if lying down.
Confirmed recall worked on knocked down victims.
Confirm it triggered mark.

Changelog

馃啈
tweak: Cult spear now marks or applies the cult stun effect to a person on hit, instead of weakening them for 6 seconds. Also does less damage on throw, and recall action is more reliable.
/:cl:

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

Probably doesn't need to be said, but this advances #18179 (and is the last thing left on the list!)

@hal9000PR hal9000PR added Balance This PR will modify how effective something is or isnt Project Progression This PR is progress on one of the current projects labels Oct 10, 2022
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally -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 -Status: Awaiting approval This PR is waiting for approval internally labels Oct 10, 2022
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.

Few small things. Looks good otherwise

code/game/gamemodes/cult/cult_items.dm Outdated Show resolved Hide resolved
code/game/gamemodes/cult/cult_items.dm Outdated Show resolved Hide resolved
code/game/gamemodes/cult/cult_items.dm Outdated Show resolved Hide resolved
code/game/gamemodes/cult/cult_items.dm Outdated Show resolved Hide resolved
code/game/gamemodes/cult/cult_items.dm Outdated Show resolved Hide resolved
code/game/gamemodes/cult/cult_items.dm Outdated Show resolved Hide resolved
Qwertytoforty and others added 2 commits October 29, 2022 12:12
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Copy link
Member

@S34NW S34NW left a comment

Choose a reason for hiding this comment

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

Seems fine code-wise now

@farie82 farie82 merged commit a7bef74 into ParadiseSS13:master Nov 2, 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 Project Progression This PR is progress on one of the current projects
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants