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 91 commits into
base: master
Choose a base branch
from
Draft

Fax Responders TestMerge Collection #7165

wants to merge 91 commits into from
+730 −92

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
This was referenced Sep 15, 2024
Open
Closed
cm13-github added a commit that referenced this pull request Sep 15, 2024
@cm13-github
TGS Test Merge (#7165)
2a8c9c4
This was referenced Sep 15, 2024
Open
Open
cm13-github added a commit that referenced this pull request Sep 16, 2024
@cm13-github
TGS Test Merge (#7165)
41af351
@cm13-issue-bot cm13-issue-bot mentioned this pull request Sep 16, 2024
Open
cm13-github added a commit that referenced this pull request Sep 18, 2024
@cm13-github
TGS Test Merge (#7165)
61160dc
@realforest2001 realforest2001 marked this pull request as draft September 18, 2024 16:08
@cm13-issue-bot cm13-issue-bot mentioned this pull request Sep 18, 2024
Closed
cm13-github added a commit that referenced this pull request Sep 20, 2024
@cm13-github
TGS Test Merge (#7165)
3d97f0d
@cm13-issue-bot cm13-issue-bot mentioned this pull request Sep 20, 2024
Open
cm13-github added a commit that referenced this pull request Sep 20, 2024
@cm13-github
TGS Test Merge (#7165)
f750b77
This was referenced Sep 20, 2024
Open
Open
cm13-github added a commit that referenced this pull request Sep 23, 2024
@cm13-github
TGS Test Merge (#7165)
aa5acd7
@cm13-issue-bot cm13-issue-bot mentioned this pull request Sep 23, 2024
Open
cm13-github added a commit that referenced this pull request Sep 23, 2024
@cm13-github
TGS Test Merge (#7165)
af2ff80
@Willzadl Willzadl mentioned this pull request Sep 23, 2024
Closed
3 tasks
@cm13-issue-bot cm13-issue-bot mentioned this pull request Sep 24, 2024
Open
cm13-github added a commit that referenced this pull request Sep 24, 2024
@cm13-github
TGS Test Merge (#7165)
516b593
This was referenced Sep 26, 2024
Open
Open
@realforest2001 realforest2001 force-pushed the project/fax_responders_tm branch from 48de97d to 2edf439 Compare January 20, 2025 19:27
@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 Jan 20, 2025
Fixup maps in TGM format
ab14b75 
4e28767: maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
4e28767: maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
4e28767: maps/map_files/USS_Almayer/USS_Almayer.dmm

Automatically commited by: tools\mapmerge2\fixup.py
cm13-github added a commit that referenced this pull request Jan 20, 2025
@cm13-github
TGS Test Merge (#7165)
f3b05e7
This was referenced Jan 20, 2025
Open
Open
cm13-github added a commit that referenced this pull request Jan 20, 2025
@cm13-github
TGS Test Merge (#7165)
6da6180
cm13-github added a commit that referenced this pull request Jan 21, 2025
@cm13-github
TGS Test Merge (#7165)
5e45441
cm13-github added a commit that referenced this pull request Jan 21, 2025
@cm13-github
TGS Test Merge (#7165)
7734652
cm13-github added a commit that referenced this pull request Jan 21, 2025
@cm13-github
TGS Test Merge (#7165)
128d03e
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jan 25, 2025
@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 Jan 25, 2025
forest2001 added 2 commits January 25, 2025 18:21
vendor
1240499
Fixup maps in TGM format
aaf15da 
f1afd82: maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
f1afd82: maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
f1afd82: maps/map_files/USS_Almayer/USS_Almayer.dmm
f1afd82: maps/templates/lazy_templates/fax_responder_base.dmm

Automatically commited by: tools\mapmerge2\fixup.py
cm13-github added a commit that referenced this pull request Jan 25, 2025
@cm13-github
TGS Test Merge (#7165)
3f0a968
cm13-github added a commit that referenced this pull request Jan 25, 2025
@cm13-github
TGS Test Merge (#7165)
7fe29d3
cm13-github added a commit that referenced this pull request Jan 25, 2025
@cm13-github
TGS Test Merge (#7165)
3ec5ff4
@cm13-issue-bot cm13-issue-bot mentioned this pull request Jan 25, 2025
Open
@MistChristmas MistChristmas mentioned this pull request Jan 26, 2025
Open
3 tasks
@TheManWithNoHands TheManWithNoHands mentioned this pull request Jan 26, 2025
Open
3 tasks
@cm13-issue-bot cm13-issue-bot mentioned this pull request Jan 26, 2025
Open
@Git-Nivrak Git-Nivrak mentioned this pull request Jan 26, 2025
Open
3 tasks
cm13-github added a commit that referenced this pull request Jan 26, 2025
@cm13-github
TGS Test Merge (#7165)
4cd9d06
cm13-github added a commit that referenced this pull request Jan 26, 2025
@cm13-github
TGS Test Merge (#7165)
a134464
@cm13-issue-bot cm13-issue-bot mentioned this pull request Jan 26, 2025
Open
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
Review Backlog
Status: Awaiting Review
Milestone
Fax Responders
Development

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