Skip to content

TM Holder: Explosion Waves + Movement Optimizations - #12803

Draft
fira wants to merge 40 commits into
cmss13-devs:masterfrom
fira:move-opti-expwaves
Draft

TM Holder: Explosion Waves + Movement Optimizations#12803
fira wants to merge 40 commits into
cmss13-devs:masterfrom
fira:move-opti-expwaves

Conversation

@fira

@fira fira commented Aug 1, 2026

Copy link
Copy Markdown
Member

This is basically just #12753 on top of #12793 due to a conflict in /turf/Entered regarding CellAuto, so that both can be tested together.

@fira fira added Do Not Merge If you merge this PR, I will annihilate you Testmerge Candidate we'll test this while you're asleep and the server has 10 players Test Merge Only This PR's purpose is for testmerges only. labels Aug 1, 2026
@github-project-automation github-project-automation Bot moved this to Awaiting Review in Review Backlog Aug 1, 2026
@cmss13-ci cmss13-ci Bot added Sprites Remove the soul from the game. Missing Changelog Maintainers always document their changes. size/XL Denotes a PR that changes 799-1999 lines, ignoring generated files. labels Aug 1, 2026
@cm13-github

cm13-github commented Aug 1, 2026

Copy link
Copy Markdown
Contributor

Test merge deployment history:

Test Merge Deployed @ 08/01/2026 13:15:53 +00:00:
Server Instance

CM13 Live

Revision

Origin: 9392acb
Pull Request: 31a8f89
Server: 8719486

Test Merge Removed @ 08/01/2026 13:54:08 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 08/01/2026 14:34:34 +00:00:
Server Instance

CM13 Live

Revision

Origin: 9392acb
Pull Request: 8a84e4c
Server: 5a028ec

Test Merge Updated @ 08/01/2026 16:05:00 +00:00:
Server Instance

CM13 Live

Revision

Origin: 9392acb
Pull Request: 258ac18
Server: 0d760af

Test Merge Removed @ 08/02/2026 01:15:14 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 08/02/2026 08:08:30 +00:00:
Server Instance

CM13 Live

Revision

Origin: 86c7947
Pull Request: 80f96a9
Server: f18f5cc

Test Merge Updated @ 08/02/2026 11:12:30 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8939353
Pull Request: 80f96a9
Server: 6063bbeae562ecdd6a84b4681ddfe2b74799dfe8

Test Merge Updated @ 08/02/2026 11:36:24 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8939353
Pull Request: e814a90
Server: f2b106d

Test Merge Removed @ 08/02/2026 11:54:15 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 08/03/2026 02:28:51 +00:00:
Server Instance

CM13 Live

Revision

Origin: e732f93
Pull Request: fff8611
Server: 9fd1fe7

Test Merge Updated @ 08/03/2026 03:17:17 +00:00:
Server Instance

CM13 Live

Revision

Origin: 0ad7658
Pull Request: fff8611
Server: f56732625052d9b2ceb5802f321943778a876017

Test Merge Updated @ 08/03/2026 03:48:07 +00:00:
Server Instance

CM13 Live

Revision

Origin: 36b2515
Pull Request: fff8611
Server: 0352f356c98b1e67da78237045c4b2e5b1623db8

Test Merge Updated @ 08/03/2026 04:49:11 +00:00:
Server Instance

CM13 Live

Revision

Origin: 42a08aa
Pull Request: fff8611
Server: b683e4afdb401401a90f7e06c86512f1e813e66c

Test Merge Updated @ 08/03/2026 06:33:34 +00:00:
Server Instance

CM13 Live

Revision

Origin: 42a08aa
Pull Request: fff8611
Server: 7c1e9ec

Test Merge Updated @ 08/03/2026 07:05:14 +00:00:
Server Instance

CM13 Live

Revision

Origin: 42a08aa
Pull Request: fff8611
Server: d58dc56

Test Merge Updated @ 08/03/2026 07:46:01 +00:00:
Server Instance

CM13 Live

Revision

Origin: 42a08aa
Pull Request: fff8611
Server: 7c1e9ec

Test Merge Updated @ 08/03/2026 08:52:24 +00:00:
Server Instance

CM13 Live

Revision

Origin: a19a230
Pull Request: fff8611
Server: 502fdc4fe53518f0404d5187099fa86ff1b89348

Test Merge Updated @ 08/03/2026 11:37:31 +00:00:
Server Instance

CM13 Live

Revision

Origin: a19a230
Pull Request: fff8611
Server: 21bc6e8

Test Merge Updated @ 08/03/2026 13:50:41 +00:00:
Server Instance

CM13 Live

Revision

Origin: a19a230
Pull Request: fff8611
Server: 8fd546c

Test Merge Updated @ 08/04/2026 03:00:48 +00:00:
Server Instance

CM13 Live

Revision

Origin: a03be5c
Pull Request: fff8611
Server: 24076b8695338851ff76055bd6a65da8aa328a9a

Test Merge Removed @ 08/04/2026 04:00:05 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 08/04/2026 16:55:54 +00:00:
Server Instance

CM13 Live

Revision

Origin: a03be5c
Pull Request: fff8611
Server: 76f513f

Test Merge Updated @ 08/04/2026 17:16:32 +00:00:
Server Instance

CM13 Live

Revision

Origin: bfdb66a
Pull Request: aa3cd12
Server: 5f95239

Test Merge Removed @ 08/04/2026 17:21:42 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 08/04/2026 17:56:07 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8aa3d60
Pull Request: d000ba4
Server: 88a1b0e

Test Merge Updated @ 08/04/2026 18:36:46 +00:00:
Server Instance

CM13 Live

Revision

Origin: 6fdc892
Pull Request: d000ba4
Server: b8d72d63766061cd78159305714f9e4dc4f18760

Test Merge Updated @ 08/04/2026 19:47:32 +00:00:
Server Instance

CM13 Live

Revision

Origin: 6fdc892
Pull Request: e2916e9
Server: 1f46a1f

Test Merge Updated @ 08/04/2026 23:08:51 +00:00:
Server Instance

CM13 Live

Revision

Origin: 9fa2b6b
Pull Request: e2916e9
Server: dc6e0cae45e085393348f9352d82b69af5c67e0f

Test Merge Updated @ 08/05/2026 03:10:38 +00:00:
Server Instance

CM13 Live

Revision

Origin: 0f81001
Pull Request: e2916e9
Server: b50e393bf6bac81f2a26068e8ad81de83a02973f

Test Merge Updated @ 08/05/2026 03:41:29 +00:00:
Server Instance

CM13 Live

Revision

Origin: 0f81001
Pull Request: e2916e9
Server: 1a41dff

Test Merge Updated @ 08/05/2026 04:12:18 +00:00:
Server Instance

CM13 Live

Revision

Origin: 0f81001
Pull Request: e2916e9
Server: b2140ec

Test Merge Removed @ 08/05/2026 04:24:14 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 08/13/2026 04:50:40 +00:00:
Server Instance

CM13 Live

Revision

Origin: 6084bb1
Pull Request: c18ef93
Server: 3b5ee5c

Test Merge Updated @ 08/13/2026 04:55:01 +00:00:
Server Instance

CM13 Live

Revision

Origin: 6084bb1
Pull Request: c18ef93
Server: 9a0ff70

Test Merge Updated @ 08/13/2026 06:22:18 +00:00:
Server Instance

CM13 Live

Revision

Origin: 21dc526
Pull Request: c18ef93
Server: b829b675a9b38c0832cab41416f7c661238f260a

Test Merge Removed @ 08/13/2026 07:34:13 +00:00:
Server Instance

CM13 Live

@wgtjunior743

Copy link
Copy Markdown
Contributor

I can already tell this is truly making it less laggy

@fira

fira commented Aug 2, 2026

Copy link
Copy Markdown
Member Author

Off TM pending changes:

  • Dropship crash explosions carrying on inside crashing dropship
  • Pred SD causing them to still drop items instead of them being destroyed
  • Need to tone down some effects such as dirt and smoke plume

@fira

fira commented Aug 2, 2026

Copy link
Copy Markdown
Member Author

Current branch has an experimental fix for Dropship Crashing. During dropship crash, explosion effects will be deferred so that they can be processed later by SSdelayed_ex_act. This lets the explosion runs free and avoids problems where the explosions slow down drastically and get into the landing dropship. It might be too slow however.

@fira
fira marked this pull request as draft August 3, 2026 18:09
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 13, 2026
@cm13-github

Copy link
Copy Markdown
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Do Not Merge If you merge this PR, I will annihilate you Merge Conflict PR can't be merged because it touched too much code Missing Changelog Maintainers always document their changes. size/XL Denotes a PR that changes 799-1999 lines, ignoring generated files. Sprites Remove the soul from the game. Test Merge Only This PR's purpose is for testmerges only. Testmerge Candidate we'll test this while you're asleep and the server has 10 players

Projects

Status: Awaiting Review

Development

Successfully merging this pull request may close these issues.

3 participants