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.

Sign up for GitHub

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

Jump to bottom

Fax Responders TestMerge Collection #7165

Draft
wants to merge 65 commits into
base: master
Choose a base branch
from
Draft

Fax Responders TestMerge Collection #7165

wants to merge 65 commits into from
+3,791 −134

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Sep 14, 2024 •
edited
Loading

@realforest2001 realforest2001 added the Test Merge Only This PR's purpose is for testmerges only. label Sep 14, 2024
@cmss13-ci cmss13-ci bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? UI deletes nanoui/html Missing Changelog Maintainers always document their changes. labels Sep 14, 2024
cm13-github added a commit that referenced this pull request Sep 14, 2024
@cm13-github
TGS Test Merge (#7165)
18be573
@cm13-issue-bot cm13-issue-bot mentioned this pull request Sep 15, 2024
Open
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Oct 29, 2024
@realforest2001 realforest2001 changed the title Fax Responders & Paperwork Prefabs hybrid TM Fax Responders TestMerge Collection Oct 29, 2024
cm13-github added a commit that referenced this pull request Oct 29, 2024
@cm13-github
TGS Test Merge (#7165)
dc0d73a
cm13-github added a commit that referenced this pull request Oct 29, 2024
@cm13-github
TGS Test Merge (#7165)
3e4be96
cm13-github added a commit that referenced this pull request Oct 29, 2024
@cm13-github
TGS Test Merge (#7165)
4175d7a
@Shibouze Shibouze mentioned this pull request Oct 29, 2024
Open
3 tasks
cm13-github added a commit that referenced this pull request Oct 30, 2024
@cm13-github
TGS Test Merge (#7165)
64ae11a
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Oct 30, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Nov 16, 2024
cm13-github added a commit that referenced this pull request Nov 16, 2024
@cm13-github
TGS Test Merge (#7165)
52b2515
cm13-github added a commit that referenced this pull request Nov 16, 2024
@cm13-github
TGS Test Merge (#7165)
74f959d
@cm13-issue-bot cm13-issue-bot mentioned this pull request Nov 17, 2024
Open
@zzzmike zzzmike mentioned this pull request Nov 17, 2024
Open
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Nanu308 Nanu308 Awaiting requested review from Nanu308 Nanu308 is a code owner

Assignees
No one assigned
Labels
Mapping did you remember to save in tgm format? Missing Changelog Maintainers always document their changes. Sprites Remove the soul from the game. Test Merge Only This PR's purpose is for testmerges only. UI deletes nanoui/html
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@realforest2001 @cm13-github