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

Fax Responders TestMerge Collection #7165

wants to merge 143 commits into from
+11,614 −3,472

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Sep 14, 2024 •
edited
Loading

TESTMERGE ONLY

realforest2001 and others added 30 commits December 13, 2023 22:57
@realforest2001
x
1ae9e9f
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into forest/paperwork
7cee84a
@realforest2001
It works!
0851378
@realforest2001
pens and some MP forms
55870bd
@realforest2001
WY liaison docs
328dae8
@realforest2001
state
6f6c5e9
@realforest2001
x
7015f84
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into forest/paperwork
b4f9ac9
@realforest2001
cl mapping
f0b98a5
@realforest2001
x
2db8a2e
@realforest2001
Merge branch 'master' into forest/paperwork
0aaccae
@realforest2001
works with the CDN.
cf8ddc5
@realforest2001
Apply suggestions from code review
df10b99
@realforest2001
reset almayer to master
7eff867
@realforest2001
cl and brig
391c619
@realforest2001
chinook pens
96d6d46
@realforest2001
icons
8682416
@realforest2001
wrong cabinet!
bca88a5
@realforest2001
wy_bw
7b4fc48
@realforest2001
crayon blanks
14ad4e5
@realforest2001
I fixed fields!
5538d00
@realforest2001
reshuffle
e4ce751
@realforest2001
Update code/modules/paperwork/prefab_papers/wey_yu/liaison/nda_long.dm
831b821
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into forest/paperwork
16db60d
@realforest2001
floor fix
991981d
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into forest/paperwork
61f0ab2
@realforest2001
scale
3991b2f
@realforest2001
map reset
2dd3bc0
@realforest2001
dead mao
849386d
@realforest2001
attempt 2
b56e5e1
@cm13-issue-bot cm13-issue-bot mentioned this pull request Dec 23, 2024
Open
cm13-github added a commit that referenced this pull request Dec 24, 2024
@cm13-github
TGS Test Merge (#7165)
7af8596
@cm13-issue-bot cm13-issue-bot mentioned this pull request Dec 24, 2024
Open
cm13-github added a commit that referenced this pull request Dec 24, 2024
@cm13-github
TGS Test Merge (#7165)
6d6897e
cm13-github added a commit that referenced this pull request Dec 25, 2024
@cm13-github
TGS Test Merge (#7165)
45f9852
cm13-github added a commit that referenced this pull request Dec 25, 2024
@cm13-github
TGS Test Merge (#7165)
7957d76
cm13-github added a commit that referenced this pull request Dec 25, 2024
@cm13-github
TGS Test Merge (#7165)
760d3a7
cm13-github added a commit that referenced this pull request Dec 25, 2024
@cm13-github
TGS Test Merge (#7165)
2942342
cm13-github added a commit that referenced this pull request Dec 25, 2024
@cm13-github
TGS Test Merge (#7165)
4ef313b
This was referenced Dec 26, 2024
Open
Open
Open
Open
Open
cm13-github added a commit that referenced this pull request Dec 27, 2024
@cm13-github
TGS Test Merge (#7165)
3c4ed7b
This was referenced Dec 27, 2024
Open
Open
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/fax_re…
f0605f6 
…sponders/cams
@realforest2001
Fixup maps in TGM format
8b42323 
9c6eb17: maps/map_files/BigRed/BigRed.dmm
9c6eb17: maps/map_files/DesertDam/Desert_Dam.dmm
9c6eb17: maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
9c6eb17: maps/map_files/Kutjevo/Kutjevo.dmm
9c6eb17: maps/map_files/New_Varadero/New_Varadero.dmm
9c6eb17: maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm

Automatically commited by: tools\mapmerge2\fixup.py
@realforest2001
Hybrisa
ea6382b
@realforest2001
Chances Claim
8243a22
@realforest2001
Shiva's Snowball
29d8f25
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/fax_re…
00c6a27 
…sponders/cams
@realforest2001
Fixup maps in TGM format
038d55a 
6e6c781: maps/map_files/DesertDam/Desert_Dam.dmm
6e6c781: maps/map_files/LV624/LV624.dmm
6e6c781: maps/map_files/New_Varadero/New_Varadero.dmm

Automatically commited by: tools\mapmerge2\fixup.py
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/fax_re…
52163e2 
…sponders/test_merge
@realforest2001
hybrisa compat
ac82c94
@realforest2001
Merge branch 'project/fax_responders/cams' into project/fax_responder…
c49bcd3 
…s/test_merge
@realforest2001
Listening Bugs
d217338
cm13-github added a commit that referenced this pull request Dec 29, 2024
@cm13-github
TGS Test Merge (#7165)
5e72db5
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.
4 participants
@realforest2001 @cm13-github @kiVts @Syndro101