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

Adds Shockwaves to Explosions and Xeno Screeches #5938

Merged
merged 14 commits into from
Apr 21, 2024

Conversation

GrrrKitten
Copy link
Contributor

@GrrrKitten GrrrKitten commented Mar 13, 2024

About the pull request

Mostly ported from TGMC via code from Ivanmixo + Tiviplus

Tested and very functional, only activates on explosions with above 150 power meaning:

notable would shockwave:
-yajuta casters
-HE rockets
-nuke
-pod decompresion
-CAS minirockets
-All OB's
-most OT nades

notable wouldnt shockwave:
-AP rockets
-Mateba HE
-plastic explosives
-sentry explosions
-HEDP's
-HEFA
-other tiny explosions

Also adds shockwaves to:
-Queen Screech (very large)
-Predalien Screech (smaller)

Explain why it's good for the game

Looks pretty cool, purely a VFX change via render plates. After extensively testing it for a few hours then going to play an actual round and seeing our OB's in their current state it was so sad.

Testing Photographs and Procedure

Screenshots & Videos

video had to be stupid compressed for github and also I cant crop it good cause photoshop said no more rendering today so have fun with this:
https://github.com/cmss13-devs/cmss13/assets/158611449/a83d26ea-3f7f-4053-8be4-d15ad707cdbc

Queen + Predalien Screech from 3 seperate POV's

screechtest3.2.mp4

Changelog

🆑
add: Adds shockwave VFX to powerful explosions
add: Adds shockwave VFX to Queen + Predalien screech
/:cl:

@github-actions github-actions bot added the Feature Feature coder badge label Mar 13, 2024
@GrrrKitten GrrrKitten changed the title Adds shockwaves to explosions via Tivi+Ivanmixo Adds shockwaves to explosions Mar 14, 2024
fira
fira previously requested changes Mar 14, 2024
Copy link
Member

@fira fira left a comment

Choose a reason for hiding this comment

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

also this is awesome

code/game/objects/effects/temporary_visuals.dm Outdated Show resolved Hide resolved
@Birdtalon
Copy link
Contributor

Very cool.

@Birdtalon Birdtalon added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Mar 18, 2024
cm13-github added a commit that referenced this pull request Mar 19, 2024
cm13-github added a commit that referenced this pull request Mar 21, 2024
cm13-github added a commit that referenced this pull request Mar 21, 2024
cm13-github added a commit that referenced this pull request Mar 22, 2024
cm13-github added a commit that referenced this pull request Mar 23, 2024
code/datums/autocells/explosion.dm Outdated Show resolved Hide resolved
code/game/objects/effects/temporary_visuals.dm Outdated Show resolved Hide resolved
code/game/objects/effects/temporary_visuals.dm Outdated Show resolved Hide resolved
code/__DEFINES/qdel.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft March 25, 2024 09:51
cm13-github added a commit that referenced this pull request Mar 26, 2024
cm13-github added a commit that referenced this pull request Mar 26, 2024
cm13-github added a commit that referenced this pull request Mar 26, 2024
@cuberound cuberound mentioned this pull request Mar 26, 2024
3 tasks
@GrrrKitten GrrrKitten changed the title Adds shockwaves to explosions Adds Shockwaves to Explosions and Xeno Screeches Mar 26, 2024
@GrrrKitten GrrrKitten marked this pull request as ready for review March 26, 2024 19:21
@GrrrKitten GrrrKitten requested a review from harryob March 26, 2024 20:40
cm13-github added a commit that referenced this pull request Mar 26, 2024
@realforest2001
Copy link
Member

Off TM for now

Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Apr 15, 2024
@Drulikar Drulikar removed the Stale beg a maintainer to review your PR label Apr 20, 2024
code/game/objects/effects/temporary_visuals.dm Outdated Show resolved Hide resolved
code/game/objects/effects/temporary_visuals.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar dismissed stale reviews from harryob and fira April 21, 2024 06:26

Resolved

@GrrrKitten
Copy link
Contributor Author

tested and functional with the new commits

@GrrrKitten GrrrKitten marked this pull request as ready for review April 21, 2024 13:21
@Drulikar Drulikar added this pull request to the merge queue Apr 21, 2024
Merged via the queue into cmss13-devs:master with commit c6c0443 Apr 21, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Apr 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants