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

The Particlening #3239

Merged
merged 34 commits into from
Aug 26, 2024
Merged

The Particlening #3239

merged 34 commits into from
Aug 26, 2024

Conversation

rye-rice
Copy link
Member

About The Pull Request

Fixes #1793

This adds a fuck ton of particles to the game. These are almost entirely ported from tgstation, specifically:
tgstation/tgstation#71110 (I was unable to get the editor to work, so this is just the backend fancy stuff)
tgstation/tgstation#59869 (particles)
tgstation/tgstation#60515 (particles)
tgstation/tgstation#74555 (particles)

And because atomization is not in my name, I have also done added my own spin on this, and that is making blood show up as a particle effect, instead of mysteriously showing up on the floor. I also made the mysteriously showing up on the floor bit more clearer if you are spilling a lot of blood.

Because of the above, I went further and ported DaedalusDock/daedalusdock#79 (blood squirts only) as well for being shot, and some additions I made myself. I am aware using sleep() is bad practice, but I'm not sure how I would avoid using it here outside of rearranging how a lot of things work, so ill just say its "fine"

Also gibbing doesn't destroy your body anymore, however it STILL will be very hard to fix you reguardless, since you still fall apart like a lego character, it's just you no longer need to stuff them into a legion corpse.

And during testing since it annoyed me, bloodloss effects are more pronounced and harder to ignore, taken mostly from https://github.com/tgstation/TerraGov-Marine-Corps 's bloodloss effects but less severe in a way.

And one last thing, bone breaking has sound effects, from Terragov above. Cronch.

Why It's Good For The Game

While i'm not convinced over using particles over hand drawn sprite effects, I cannot deny i see the potential in them, especially here!

Screenshot_15726

Screenshot_15727

Screenshot_15728

Screenshot_15729

Screenshot_15730

Changelog

🆑 Baystation12, Kapu1178, rye-rice
add: Particles!
add: Bleeding has better feedback
add: Bone breaking now has sound effects
add: Getting shot now throws blood squirts! Live through the somme for REAL this time!
balance: gibbing no longer destroys your chest, no more legion transfers!
fix: Lava particles should no longer destroy your FPS

/:cl:

@rye-rice rye-rice requested a review from a team as a code owner July 23, 2024 20:06
@github-actions github-actions bot added Sprites A bikeshed full of soulless bikes. Sound USSR Anthem 2.66 MB file. Code change Watch something violently break. labels Jul 23, 2024
@Apogee-dev
Copy link
Contributor

Apogee-dev commented Jul 23, 2024

I already gave my opinion about the gibbing changes on discord but I’ll repeat them here: I think it’s a move in the wrong direction. All the sources of gibbing in the game are rare, predictable, or player-initiated. If implanting brains into legion corpses is unbelievable and jank, I’d rather remove brain implanting entirely (it’s kind of absurd that random miners working out of a space ship’s bathroom can technically pull that off anyway). Require an MMI to save somebody who’s been debrained or something. That, and leaving everything intact but scattered around sort of defeats the point of gibbing anyway, given it specifically represents somebody getting the business end of the chunky salsa rule, not neatly dismembered.
Not all round removal is a bad thing, and some failure states- especially ones that are predictable or triggered by another player’s direct choice- should not be recoverable. Bay gets by just fine with permadeath- they have a vastly different medical system that makes dying much harder, but in theory anything can permakill you, and in the end that facilitates rather than disrupts roleplay. I’m not saying we should switch to brainmed, but I am pointing out that round removal has a place even on roleplay servers.

@thgvr
Copy link
Member

thgvr commented Jul 23, 2024

Particle updates are great. This has no reason to be bundled with the gibbing change though

@Leon9621
Copy link

As a note, I believe the bone breaking sounds here cause people to crash when they play, depending on the version of BYOND they have installed. Not sure why- wish I could be more helpful here, sorry.

https://i.imgur.com/c9zeSqP.png pic of it happening to me, cloudbreak mentioned it happening a few times as well


/datum/looping_sound/weather/rain/storm
mid_sounds = list(
'sound/ambience/storm_outdoors.ogg' = 1
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
'sound/ambience/storm_outdoors.ogg' = 1
'sound/ambience/storm_outdoors.ogg' = 1,

if(4 to INFINITY)
bleeeding_wording = "<b>Your heartbeat beats extremely and unstably fast as you lose a massive amount of blood!!</b>"

/* how bleeding works has changed, this is now useless
Copy link
Member

Choose a reason for hiding this comment

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

Then delete it

addtimer(CALLBACK(src, PROC_REF(break_bone_feedback), 1 SECONDS))

/obj/item/bodypart/proc/break_bone_feedback()
owner.visible_message("<span class='danger'>You hear a cracking sound coming from [owner]'s [name].</span>", "<span class='userdanger'>You feel something crack in your [name]!</span>", "<span class='danger'>You hear an awful cracking sound.</span>")
Copy link
Member

Choose a reason for hiding this comment

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

Span macros please


/obj/item/bodypart/proc/break_bone_feedback()
owner.visible_message("<span class='danger'>You hear a cracking sound coming from [owner]'s [name].</span>", "<span class='userdanger'>You feel something crack in your [name]!</span>", "<span class='danger'>You hear an awful cracking sound.</span>")
playsound(owner, list('sound/health/bone/bone_break1.ogg','sound/health/bone/bone_break2.ogg','sound/health/bone/bone_break3.ogg','sound/health/bone/bone_break4.ogg','sound/health/bone/bone_break5.ogg','sound/health/bone/bone_break6.ogg'), 100, FALSE, -1)
Copy link
Member

Choose a reason for hiding this comment

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

This is probably what is causing issues, maybe something about file access idk

thgvr
thgvr previously requested changes Jul 26, 2024
Copy link
Member

@thgvr thgvr left a comment

Choose a reason for hiding this comment

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

Leave the non-visual gibbing changes (leaving a torso behind) for a different pr and discussion

@Thera-Pissed
Copy link
Contributor

Lava particles can be grabbed by gravitational anomalies and flung around, which looks quite silly.

@thgvr
Copy link
Member

thgvr commented Aug 10, 2024

We can merge this once you take out the gibbing change that leaves a torso behind

@rye-rice
Copy link
Member Author

apologies for the delay in removing the anti-salt measure, got distracted by a fucking butterfly; lgtm, etc

@rye-rice rye-rice added this pull request to the merge queue Aug 26, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 26, 2024
@thgvr thgvr added this pull request to the merge queue Aug 26, 2024
Merged via the queue into shiptest-ss13:master with commit 524e31a Aug 26, 2024
14 checks passed
Constellado pushed a commit to Constellado/PentestOld that referenced this pull request Aug 27, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Fixes shiptest-ss13#1793

This adds a fuck ton of particles to the game. These are almost entirely
ported from tgstation, specifically:
tgstation/tgstation#71110 (I was unable to get
the editor to work, so this is just the backend fancy stuff)
tgstation/tgstation#59869 (particles)
tgstation/tgstation#60515  (particles)
tgstation/tgstation#74555 (particles)

And because atomization is not in my name, I have also done added my own
spin on this, and that is making blood show up as a particle effect,
instead of mysteriously showing up on the floor. I also made the
mysteriously showing up on the floor bit more clearer if you are
spilling a lot of blood.

Because of the above, I went further and ported
DaedalusDock/daedalusdock#79 (blood squirts
only) as well for being shot, and some additions I made myself. I am
aware using sleep() is bad practice, but I'm not sure how I would avoid
using it here outside of rearranging how a lot of things work, so ill
just say its "fine"

Also gibbing doesn't destroy your body anymore, however it STILL will be
very hard to fix you reguardless, since you still fall apart like a lego
character, it's just you no longer need to stuff them into a legion
corpse.

And during testing since it annoyed me, bloodloss effects are more
pronounced and harder to ignore, taken mostly from
https://github.com/tgstation/TerraGov-Marine-Corps 's bloodloss effects
but less severe in a way.

And one last thing, bone breaking has sound effects, from Terragov
above. Cronch.

## Why It's Good For The Game

While i'm not convinced over using particles over hand drawn sprite
effects, I cannot deny i see the potential in them, especially here!


![Screenshot_15726](https://github.com/user-attachments/assets/714b60d7-46f0-429f-a94a-8b13220fb39e)


![Screenshot_15727](https://github.com/user-attachments/assets/8b00ad2b-13ba-4971-b2b4-dbf1975dce57)


![Screenshot_15728](https://github.com/user-attachments/assets/b78f91bf-0462-41a9-88aa-5f7b76c222ac)


![Screenshot_15729](https://github.com/user-attachments/assets/32e05c97-457c-4c11-a7c1-fe6f1aa6235f)


![Screenshot_15730](https://github.com/user-attachments/assets/27a6b03a-ca73-41e1-bfee-9a3cc8a25404)


## Changelog

:cl: Baystation12, Kapu1178, rye-rice
add: Particles!
add: Bleeding has better feedback
add: Bone breaking now has sound effects
add: Getting shot now throws blood squirts! Live through the somme for
REAL this time!
balance: gibbing no longer destroys your chest, no more legion
transfers!
fix: Lava particles should no longer destroy your FPS

/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: retlaw34 <[email protected]>
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Sep 2, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Fixes shiptest-ss13#1793

This adds a fuck ton of particles to the game. These are almost entirely
ported from tgstation, specifically:
tgstation/tgstation#71110 (I was unable to get
the editor to work, so this is just the backend fancy stuff)
tgstation/tgstation#59869 (particles)
tgstation/tgstation#60515  (particles)
tgstation/tgstation#74555 (particles)

And because atomization is not in my name, I have also done added my own
spin on this, and that is making blood show up as a particle effect,
instead of mysteriously showing up on the floor. I also made the
mysteriously showing up on the floor bit more clearer if you are
spilling a lot of blood.

Because of the above, I went further and ported
DaedalusDock/daedalusdock#79 (blood squirts
only) as well for being shot, and some additions I made myself. I am
aware using sleep() is bad practice, but I'm not sure how I would avoid
using it here outside of rearranging how a lot of things work, so ill
just say its "fine"

Also gibbing doesn't destroy your body anymore, however it STILL will be
very hard to fix you reguardless, since you still fall apart like a lego
character, it's just you no longer need to stuff them into a legion
corpse.

And during testing since it annoyed me, bloodloss effects are more
pronounced and harder to ignore, taken mostly from
https://github.com/tgstation/TerraGov-Marine-Corps 's bloodloss effects
but less severe in a way.

And one last thing, bone breaking has sound effects, from Terragov
above. Cronch.

## Why It's Good For The Game

While i'm not convinced over using particles over hand drawn sprite
effects, I cannot deny i see the potential in them, especially here!


![Screenshot_15726](https://github.com/user-attachments/assets/714b60d7-46f0-429f-a94a-8b13220fb39e)


![Screenshot_15727](https://github.com/user-attachments/assets/8b00ad2b-13ba-4971-b2b4-dbf1975dce57)


![Screenshot_15728](https://github.com/user-attachments/assets/b78f91bf-0462-41a9-88aa-5f7b76c222ac)


![Screenshot_15729](https://github.com/user-attachments/assets/32e05c97-457c-4c11-a7c1-fe6f1aa6235f)


![Screenshot_15730](https://github.com/user-attachments/assets/27a6b03a-ca73-41e1-bfee-9a3cc8a25404)


## Changelog

:cl: Baystation12, Kapu1178, rye-rice
add: Particles!
add: Bleeding has better feedback
add: Bone breaking now has sound effects
add: Getting shot now throws blood squirts! Live through the somme for
REAL this time!
balance: gibbing no longer destroys your chest, no more legion
transfers!
fix: Lava particles should no longer destroy your FPS

/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: retlaw34 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Having lava in your view results in FPS drops
5 participants