-
Notifications
You must be signed in to change notification settings - Fork 68
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
Smell Component & Blood Squirts #79
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LemonInTheDark
pushed a commit
to LemonInTheDark/daedalusdock
that referenced
this pull request
Mar 10, 2023
…65597 [MIRROR] Refactor mood events font colors, spans, and newlines
3 tasks
github-merge-queue bot
pushed a commit
to shiptest-ss13/Shiptest
that referenced
this pull request
Aug 26, 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 #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!      ## 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]>
github-merge-queue bot
pushed a commit
to shiptest-ss13/Shiptest
that referenced
this pull request
Aug 26, 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 #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!      ## 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]>
github-merge-queue bot
pushed a commit
to shiptest-ss13/Shiptest
that referenced
this pull request
Aug 26, 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 #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!      ## 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]>
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!      ## 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!      ## 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]>
Constellado
pushed a commit
to Constellado/PentestDevelopment
that referenced
this pull request
Oct 7, 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. --> 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. While i'm not convinced over using particles over hand drawn sprite effects, I cannot deny i see the potential in them, especially here!      :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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
Adds a component you can attach to objects to have nearby mobs able to smell them. Subtypes for strengths.
Greatly inspired by Baystation 12's scent extention.
Changelog
🆑 Baystation12, Kapu1178
add: Smell component
add: Blood has an odor of DOOM!
add: Flying blood splatters leave a trail of blood.
fix: N2O tanks now actually contain N2O. Whoops!
tweak: Fires from explosions burn much shorter
/:cl: