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

Burn decal burn, hybrisa delaging #8049

Merged
merged 16 commits into from
Jan 13, 2025
Merged

Conversation

cuberound
Copy link
Contributor

@cuberound cuberound commented Jan 8, 2025

12k decals turned from object to overlay of turf burn decal burn, this is higly experimental, there will be issues with blood and other unforseen conseqences

Explain why it's good for the game

reduces client side lag on hybrisa (and other maps too but generaly they are around 4k compared to the 12 k of hybrisa

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
code: decals get burned into turf they are on, maps look the same with less lag
/:cl:

@cuberound cuberound requested a review from Nanu308 as a code owner January 8, 2025 10:27
@cmss13-ci cmss13-ci bot added Mapping did you remember to save in tgm format? Code Improvement Make the code longer labels Jan 8, 2025
code/game/objects/effects/decals/decal.dm Outdated Show resolved Hide resolved
code/game/objects/effects/decals/decal.dm Show resolved Hide resolved
code/game/objects/effects/decals/decal.dm Outdated Show resolved Hide resolved
code/game/objects/effects/decals/decal.dm Outdated Show resolved Hide resolved
code/game/objects/effects/decals/decal.dm Outdated Show resolved Hide resolved
@harryob harryob added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Jan 8, 2025
cm13-github added a commit that referenced this pull request Jan 8, 2025
@Segrain
Copy link
Contributor

Segrain commented Jan 8, 2025

This is almost certainly responsible for #8053.
image

@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jan 8, 2025
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jan 8, 2025
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@efzapa

This comment has been minimized.

@harryob harryob added this pull request to the merge queue Jan 13, 2025
Merged via the queue into cmss13-devs:master with commit 2773dcf Jan 13, 2025
28 checks passed
cmss13-ci bot added a commit that referenced this pull request Jan 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer Mapping did you remember to save in tgm format? Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

6 participants