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

[PTBF] Hallucination - Meet the Sniper #27579

Merged

Conversation

PollardTheDragon
Copy link
Contributor

@PollardTheDragon PollardTheDragon commented Dec 8, 2024

What Does This PR Do

Adds a major-tier hallucination that fires a penetrator round at the victim from somewhere outside of view range. It plays the sound of a sniper firing so you have warning that it's coming. On hit, it deals 60 stamina damage and knocks you down for 2 seconds. It is a penetrator round, so it can go through walls.

Why It's Good For The Game

More hallucinations to shake up the stale pool of hallucinations.

Testing

Spawned skrell. One had mesons one without. Stood next to active supermatter. Skrell without heard sounds, got shot, saw blood. Skrell with mesons only saw them fall over when struck.


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.

Changelog

🆑
add: Sniper hallucination
/:cl:

code/modules/hallucinations/effects/major.dm Outdated Show resolved Hide resolved
code/modules/hallucinations/effects/major.dm Show resolved Hide resolved
@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting review This PR is awaiting review from the review team label Dec 8, 2024
@PollardTheDragon PollardTheDragon marked this pull request as ready for review December 8, 2024 18:53
@lewcc lewcc changed the title [PTBR] Hallucination - Meet the Sniper [PTBF] Hallucination - Meet the Sniper Dec 9, 2024
code/modules/hallucinations/effects/major.dm Outdated Show resolved Hide resolved
code/modules/hallucinations/effects/major.dm Outdated Show resolved Hide resolved
code/modules/hallucinations/effects/major.dm Outdated Show resolved Hide resolved
code/modules/hallucinations/effects/major.dm Outdated Show resolved Hide resolved
PollardTheDragon and others added 7 commits December 11, 2024 11:30
Co-authored-by: DGamerL <[email protected]>
Signed-off-by: PollardTheDragon <[email protected]>
Co-authored-by: DGamerL <[email protected]>
Signed-off-by: PollardTheDragon <[email protected]>
Co-authored-by: DGamerL <[email protected]>
Signed-off-by: PollardTheDragon <[email protected]>
Co-authored-by: DGamerL <[email protected]>
Signed-off-by: PollardTheDragon <[email protected]>
Co-authored-by: DGamerL <[email protected]>
Signed-off-by: PollardTheDragon <[email protected]>
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally and removed -Status: Awaiting review This PR is awaiting review from the review team -Status: Awaiting approval This PR is waiting for approval internally labels Dec 25, 2024
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Jan 6, 2025
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Jan 10, 2025
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.

It looks like some xeno pounce stuff was accidentally included, please remove that.

Otherwise, code looks god to me

@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Jan 10, 2025
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Jan 12, 2025
@Burzah Burzah requested a review from DGamerL January 16, 2025 18:10
@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 Jan 29, 2025
@Burzah Burzah added this pull request to the merge queue Jan 31, 2025
Merged via the queue into ParadiseSS13:master with commit d631b7f Jan 31, 2025
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants