Skip to content

refactor: Require all overrides of Crossed to call parent#12623

Open
boskoramen wants to merge 1 commit into
cmss13-devs:masterfrom
boskoramen:crossed-setup
Open

refactor: Require all overrides of Crossed to call parent#12623
boskoramen wants to merge 1 commit into
cmss13-devs:masterfrom
boskoramen:crossed-setup

Conversation

@boskoramen

@boskoramen boskoramen commented Jul 11, 2026

Copy link
Copy Markdown
Contributor

About the pull request

First change as part of a series of changes to refactor the launching into a subsystem. Extracted from my original PR here: #7110

Explain why it's good for the game

  • Routing all Crossed calls to parent will allow us to have signals setup on Crossed

  • Part of a larger charge to move launching into a subsystem, which should be preferable to sleeps

Testing Photographs and Procedure

Testing ARES step triggers

Triggers broadcast for AI mob as expected

dreamseeker_y146Zsh9Ox.mp4
Testing facehugger Crossed trigger
dreamseeker_7L1kmrCNc9.mp4
Testing bloody feet Crossed trigger

Blood decal causes bloody feet, bloody tracks does NOT cause bloody feet

dreamseeker_6uH04mHxHu.mp4
Testing boiler gas Crossed trigger

Boiler gas does not cause damage on Crossed

dreamseeker_216kleajJx.mp4
Testing fast resin does not cause slow down
dreamseeker_2DJHLCv85i.mp4

Changelog

🆑 TheDonkified
refactor: Refactors Crossed function so that all calls to Crossed must route to the parent Crossed function
/:cl:

Refactor step triggers so calls to Trigger happen at the parent step
trigger class and conditions behind triggered are defined in provided
function

Mini refactor on smoke to use a variable for triggering smoke effects
rather than overriding the Crossed function
@github-project-automation github-project-automation Bot moved this to Awaiting Review in Review Backlog Jul 11, 2026
@cmss13-ci cmss13-ci Bot added Refactor Make the code harder to read size/M Denotes a PR that changes 50-199 lines, ignoring generated files. labels Jul 11, 2026

@fira fira left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks pretty good to me, might need quick live test to catch any edge cases

handle_rotation()


/// Called when `crossed_by` enters the atom's turf (via native Move() or doMove() if allowed).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Technically you can Cross inside contents aswell, not neccessarily on a turf

@fira fira added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Jul 12, 2026
@cm13-github

cm13-github commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

Test merge deployment history:

Test Merge Deployed @ 07/16/2026 11:51:46 +00:00:
Server Instance

CM13 Live

Revision

Origin: bbc523c
Pull Request: 3113bb7
Server: 9795ad7

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

CM13 Live

Revision

Origin: bbc523c
Pull Request: 3113bb7
Server: 29f87fa

Test Merge Updated @ 07/17/2026 06:57:53 +00:00:
Server Instance

CM13 Live

Revision

Origin: 2edb173
Pull Request: 3113bb7
Server: df663d68a79baa9df8bebe80a4d9711300725228

Test Merge Updated @ 07/17/2026 20:27:33 +00:00:
Server Instance

CM13 Live

Revision

Origin: 2edb173
Pull Request: 3113bb7
Server: 1ddf415

Test Merge Updated @ 07/18/2026 03:05:33 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8f06b5c
Pull Request: 3113bb7
Server: bdf9fe128758200c72f5555bc77cc94d2d067e6f

Test Merge Updated @ 07/18/2026 04:04:01 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8f06b5c
Pull Request: 3113bb7
Server: 62b2c3b

Test Merge Updated @ 07/18/2026 09:08:09 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8f06b5c
Pull Request: 3113bb7
Server: e77d0d2

Test Merge Updated @ 07/18/2026 13:26:08 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8f06b5c
Pull Request: 3113bb7
Server: f09f6ee

Test Merge Updated @ 07/18/2026 14:11:21 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8f06b5c
Pull Request: 3113bb7
Server: 21b09b4

Test Merge Updated @ 07/18/2026 15:18:50 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8f06b5c
Pull Request: 3113bb7
Server: cf0ce73

Test Merge Updated @ 07/18/2026 16:11:05 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8f06b5c
Pull Request: 3113bb7
Server: 42b5963

Test Merge Updated @ 07/19/2026 05:15:51 +00:00:
Server Instance

CM13 Live

Revision

Origin: 236040e
Pull Request: 3113bb7
Server: 4bb6b9e67ab477c644efb963683e637d65756bcb

Test Merge Updated @ 07/19/2026 08:17:36 +00:00:
Server Instance

CM13 Live

Revision

Origin: 36e499a
Pull Request: 3113bb7
Server: ef14afe0b104c2f0ba3dd346d4427075b8df2806

Test Merge Updated @ 07/19/2026 13:44:35 +00:00:
Server Instance

CM13 Live

Revision

Origin: 36e499a
Pull Request: 3113bb7
Server: ae73755

Test Merge Updated @ 07/19/2026 15:20:22 +00:00:
Server Instance

CM13 Live

Revision

Origin: 36e499a
Pull Request: 3113bb7
Server: bba7789

Test Merge Updated @ 07/19/2026 17:21:49 +00:00:
Server Instance

CM13 Live

Revision

Origin: a53136d
Pull Request: 3113bb7
Server: 9c7ac020e9b5579222f1b32114e3dd14533f70a4

Test Merge Updated @ 07/20/2026 03:55:36 +00:00:
Server Instance

CM13 Live

Revision

Origin: 0bdad2e
Pull Request: 3113bb7
Server: 83b0e90edb7d2d4c41ca87ea36018f187fcbca6c

Test Merge Updated @ 07/20/2026 15:00:04 +00:00:
Server Instance

CM13 Live

Revision

Origin: 0bdad2e
Pull Request: 3113bb7
Server: 7a0b9b7

Test Merge Updated @ 07/20/2026 17:31:53 +00:00:
Server Instance

CM13 Live

Revision

Origin: d868ecf
Pull Request: 3113bb7
Server: 2798a09150618681cd1ea768d8625a220f7c174f

Test Merge Updated @ 07/20/2026 18:02:45 +00:00:
Server Instance

CM13 Live

Revision

Origin: bcf2ba5
Pull Request: 3113bb7
Server: 36e496a065632a3fba3030883b61fa6a4192c8f3

Test Merge Updated @ 07/20/2026 18:33:37 +00:00:
Server Instance

CM13 Live

Revision

Origin: bcd8a3f
Pull Request: 3113bb7
Server: 59f1a998f5a4b1dba1ca702f165dfc95ec207cf8

Test Merge Updated @ 07/21/2026 03:37:14 +00:00:
Server Instance

CM13 Live

Revision

Origin: f572452
Pull Request: 3113bb7
Server: cfd3b89312c445cdf6fbc9aa040e7c2bd3ee4097

Test Merge Updated @ 07/21/2026 09:03:03 +00:00:
Server Instance

CM13 Live

Revision

Origin: f572452
Pull Request: 3113bb7
Server: bcd732b

Test Merge Updated @ 07/21/2026 10:10:17 +00:00:
Server Instance

CM13 Live

Revision

Origin: f572452
Pull Request: 3113bb7
Server: add6cc8

Test Merge Updated @ 07/21/2026 10:27:57 +00:00:
Server Instance

CM13 Live

Revision

Origin: f572452
Pull Request: 3113bb7
Server: c1199db

Test Merge Updated @ 07/21/2026 14:22:05 +00:00:
Server Instance

CM13 Live

Revision

Origin: f572452
Pull Request: 3113bb7
Server: a01ad4e

@fira

fira commented Jul 17, 2026

Copy link
Copy Markdown
Member

No issues reported so far

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

Labels

Refactor Make the code harder to read size/M Denotes a PR that changes 50-199 lines, ignoring generated files. 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