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 & Paperwork Prefabs hybrid TM #7165

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

Fax Responders & Paperwork Prefabs hybrid TM #7165

wants to merge 67 commits into from
+5,784 −269

Conversation

realforest2001
Copy link
Member

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
Presets part 1
51cd5b2
@realforest2001
job cat
6668089
@realforest2001
Part one
ddd3e5d
@realforest2001
landmark test
72ec6db
@realforest2001
whiskey fix
adceabc 
w
@cm13-issue-bot cm13-issue-bot mentioned this pull request Sep 15, 2024
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
Open
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
cm13-github added a commit that referenced this pull request Sep 26, 2024
@cm13-github
TGS Test Merge (#7165)
70095a7
cm13-github added a commit that referenced this pull request Sep 26, 2024
@cm13-github
TGS Test Merge (#7165)
c45d792
@cm13-issue-bot cm13-issue-bot mentioned this pull request Sep 28, 2024
Open
cm13-github added a commit that referenced this pull request Sep 29, 2024
@cm13-github
TGS Test Merge (#7165)
8d85e6b
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

At least 1 approving review is required to merge this pull request.

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 @harryob