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

Ports various implementations of particle effects from TGMC #2454

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

ma44
Copy link
Contributor

@ma44 ma44 commented Sep 27, 2023

About The Pull Request

Ports the following PRs:
tgstation/TerraGov-Marine-Corps#12752
tgstation/TerraGov-Marine-Corps#13963
tgstation/TerraGov-Marine-Corps#13305

Impact particles are partially implemented, I didn't look through all of the walls and objects in the Mojave folder to add debris element but this should be a good enough base to work off of.

Why It's Good For The Game

Seeing if this visual flair being added will lag the game or nah, looks pretty good.

Changelog

🆑 ma44
add: Ballistic guns now eject smoke when shooting
add: Certain objects and walls will have debris particles when hit by bullets
add: Explosions now have particles
/:cl:

@@ -0,0 +1,102 @@
#define DEBRIS_SPARKS "spark"
Copy link
Collaborator

Choose a reason for hiding this comment

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

mojave/code/datums/elements/debris.dm, line 1, column [9](https://github.com/Mojave-Sun/mojave-sun-13/actions/runs/6320722331/job/17163641058?pr=2454#step:7:10):
warning: macro redefined: DEBRIS_SPARKS
- code/__DEFINES/particles.dm:1:9: previous definition of DEBRIS_SPARKS

mojave/code/datums/elements/debris.dm, line 2, column 9:
warning: macro redefined: DEBRIS_WOOD
- code/__DEFINES/particles.dm:2:9: previous definition of DEBRIS_WOOD

mojave/code/datums/elements/debris.dm, line 3, column 9:
warning: macro redefined: DEBRIS_ROCK
- code/__DEFINES/particles.dm:3:9: previous definition of DEBRIS_ROCK

mojave/code/datums/elements/debris.dm, line 4, column 9:
warning: macro redefined: DEBRIS_GLASS
- code/__DEFINES/particles.dm:4:9: previous definition of DEBRIS_GLASS

mojave/code/datums/elements/debris.dm, line 5, column 9:
warning: macro redefined: DEBRIS_LEAF
- code/__DEFINES/particles.dm:5:9: previous definition of DEBRIS_LEAF

mojave/code/datums/elements/debris.dm, line 6, column 9:
warning: macro redefined: DEBRIS_SNOW
- code/__DEFINES/particles.dm:6:9: previous definition of DEBRIS_SNOW

Anyway to reasonably clean this up?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Merge Conflict Merge conflict
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants