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

Project ARES TM Holder (v5) #6039

Closed
wants to merge 285 commits into from
Closed

Project ARES TM Holder (v5) #6039

wants to merge 285 commits into from

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Mar 29, 2024 •
edited
Loading

@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
50e761f 
…dmin_console
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
d5275c5 
…dmin_console
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
0e41a1a 
…dmin_console
@realforest2001
Access Ticket Management
653e643 
stuff

implement
@realforest2001
span fix
2ba9163
@realforest2001
button size
9f23d87
@realforest2001
fixes the claim button
3594385 
fix mark lock
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
cc73dbf 
…dmin_console
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
2217350 
…dmin_console
@realforest2001
EXPERI-PATCH - HIJACK OBJECTIVES
448a0b9
@realforest2001
EXPERI-PATCH PATCH
3456b54
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
d954731 
…dmin_console
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
016a752 
…dmin_console
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
a3f99ad 
…dmin_console
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
14dd52a 
…dmin_console
@realforest2001
conflicts
057c3a7
@realforest2001
Merge branch 'synth_bracer' into project/SIMI
eeaafe2
@realforest2001
Conflicts
630a810 
x

x

x
@realforest2001
updates
539db35
@realforest2001
Merge branch 'master' into project/SIMIBracer
88dd47c
@realforest2001
Tweaks to phone, animations and module fixes
60a1545
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/SIMIBr…
f84fc32 
…acer
@realforest2001
code organising
c2e12b9 
glove
@realforest2001
Starting work on porting abilities
fdfaf19
@realforest2001
monitor and actions proc
87a74ec
@realforest2001
This was throwing me errors, no idea why.
123e57a
@realforest2001
monitor works
32ea35d
@realforest2001
icons
e8f4f79
@realforest2001
charging and subtypes (somehow broke hook)
28778ab
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
ee6ca39 
…dmin_console
cm13-github added a commit that referenced this pull request Aug 31, 2024
@cm13-github
TGS Test Merge (#6039)
9e4b9d7
cm13-github added a commit that referenced this pull request Aug 31, 2024
@cm13-github
TGS Test Merge (#6039)
276e22b
@cm13-issue-bot cm13-issue-bot mentioned this pull request Aug 31, 2024
Open
@professionallyretarded professionallyretarded mentioned this pull request Aug 31, 2024
Open
3 tasks
This was referenced Sep 1, 2024
Open
Closed
cm13-github added a commit that referenced this pull request Sep 2, 2024
@cm13-github
TGS Test Merge (#6039)
4d528ab
This was referenced Sep 2, 2024
Open
Open
Closed
Open
Open
cm13-github added a commit that referenced this pull request Sep 3, 2024
@cm13-github
TGS Test Merge (#6039)
c37614f
cm13-github added a commit that referenced this pull request Sep 3, 2024
@cm13-github
TGS Test Merge (#6039)
4653fec
cm13-github added a commit that referenced this pull request Sep 3, 2024
@cm13-github
TGS Test Merge (#6039)
b388e8e
cm13-github added a commit that referenced this pull request Sep 4, 2024
@cm13-github
TGS Test Merge (#6039)
039ba28
cm13-github added a commit that referenced this pull request Sep 5, 2024
@cm13-github
TGS Test Merge (#6039)
0597049
cm13-github added a commit that referenced this pull request Sep 5, 2024
@cm13-github
TGS Test Merge (#6039)
8b6cb71
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Sep 17, 2024
@cm13-github
Copy link
Contributor

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

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? Merge Conflict PR can't be merged because it touched too much code Missing Changelog Maintainers always document their changes. Sprites Remove the soul from the game. Stale Exempt PR can't go stale Test Merge Only This PR's purpose is for testmerges only. UI deletes nanoui/html
Projects
None yet
Milestone
Project ARES
Development

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