Skip to content

colony dzho spawn as colony dzho#12594

Merged
MistChristmas merged 3 commits into
cmss13-devs:masterfrom
ori-disillusion-mirnov:sadsadawd
Jul 8, 2026
Merged

colony dzho spawn as colony dzho#12594
MistChristmas merged 3 commits into
cmss13-devs:masterfrom
ori-disillusion-mirnov:sadsadawd

Conversation

@ori-disillusion-mirnov

@ori-disillusion-mirnov ori-disillusion-mirnov commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

About the pull request

titl

Explain why it's good for the game

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
fix: colony dzho spawn as colony dzho
/:cl:

@cm13-github

Copy link
Copy Markdown
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 Jul 6, 2026
@cmss13-ci cmss13-ci Bot added Fix Fix one bug, make ten more size/XS Denotes a PR that changes 0-19 lines, ignoring generated files. labels Jul 6, 2026
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 6, 2026
@cm13-github

Copy link
Copy Markdown
Contributor

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

@MistChristmas MistChristmas enabled auto-merge July 8, 2026 00:24
@MistChristmas MistChristmas added this pull request to the merge queue Jul 8, 2026
@github-project-automation github-project-automation Bot moved this from Awaiting Review to Partially Approved / Mergeable in Review Backlog Jul 8, 2026
Merged via the queue into cmss13-devs:master with commit 3d027b4 Jul 8, 2026
28 checks passed
@github-project-automation github-project-automation Bot moved this from Partially Approved / Mergeable to Merged in Review Backlog Jul 8, 2026
cmss13-ci Bot added a commit that referenced this pull request Jul 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Fix Fix one bug, make ten more size/XS Denotes a PR that changes 0-19 lines, ignoring generated files.

Projects

Status: Merged

Development

Successfully merging this pull request may close these issues.

3 participants