Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
7,676 workflow run results
7,676 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Xenomorph tutorial framework and basic tutorial (#5399) Check for merge conflicts #18952: Commit 9c9ca6b pushed by github-merge-queue bot
January 23, 2024 23:56 4m 16s master
master
January 23, 2024 23:56 4m 16s
Removes an outdated xeno tip, adds a new one. (#5501) Check for merge conflicts #18951: Commit 6fb9fce pushed by github-merge-queue bot
January 23, 2024 23:42 4m 14s master
master
January 23, 2024 23:42 4m 14s
Psychic Whisper Deadchat and Use (#5407) Check for merge conflicts #18950: Commit e992409 pushed by github-merge-queue bot
January 23, 2024 23:27 4m 17s master
master
January 23, 2024 23:27 4m 17s
React Migration - part 2 (#5493) Check for merge conflicts #18949: Commit d5dfe13 pushed by github-merge-queue bot
January 23, 2024 23:13 4m 17s master
master
January 23, 2024 23:13 4m 17s
Fixes being gibbed sometimes breaking observer movement (#5499) Check for merge conflicts #18948: Commit 67ce3a5 pushed by github-merge-queue bot
January 23, 2024 22:58 4m 16s master
master
January 23, 2024 22:58 4m 16s
Abomination rework and predator plasma rifle buff. Check for merge conflicts #18947: Pull request #5432 synchronize by Red-byte3D
January 23, 2024 22:10 10s
January 23, 2024 22:10 10s
Abomination rework and predator plasma rifle buff. Check for merge conflicts #18946: Pull request #5432 synchronize by Red-byte3D
January 23, 2024 21:51 1m 51s
January 23, 2024 21:51 1m 51s
Gardener QOL changes Check for merge conflicts #18945: Pull request #5514 synchronize by Red-byte3D
January 23, 2024 21:50 10s
January 23, 2024 21:50 10s
Abomination rework and predator plasma rifle buff. Check for merge conflicts #18944: Pull request #5432 synchronize by Red-byte3D
January 23, 2024 21:17 24s
January 23, 2024 21:17 24s
Abomination rework and predator plasma rifle buff. Check for merge conflicts #18943: Pull request #5432 synchronize by Red-byte3D
January 23, 2024 21:15 12s
January 23, 2024 21:15 12s
fix and small refactor of Areas in lower deck on almayer part2 Check for merge conflicts #18942: Pull request #5373 ready_for_review by Huffie56
January 23, 2024 19:21 14s
January 23, 2024 19:21 14s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #18941: Pull request #5458 synchronize by LC4492
January 23, 2024 18:21 16s
January 23, 2024 18:21 16s
fix and small refactor of Areas in lower deck on almayer part2 Check for merge conflicts #18940: Pull request #5373 synchronize by Huffie56
January 23, 2024 18:00 23s
January 23, 2024 18:00 23s
Reduces the burst multiplier on the M39 (#5228) Check for merge conflicts #18939: Commit 9ccc9a7 pushed by github-merge-queue bot
January 23, 2024 16:55 4m 14s master
master
January 23, 2024 16:55 4m 14s
adds warning messages when CAS sonic boom happens and makes the boom fallof slower Check for merge conflicts #18938: Pull request #5410 synchronize by cuberound
January 23, 2024 16:29 27s
January 23, 2024 16:29 27s
adds warning messages when CAS sonic boom happens and makes the boom fallof slower Check for merge conflicts #18937: Pull request #5410 synchronize by cuberound
January 23, 2024 16:28 13s
January 23, 2024 16:28 13s
(finishes) porting emissives from tgmc Check for merge conflicts #18936: Pull request #5405 synchronize by harryob
January 23, 2024 16:21 11s
January 23, 2024 16:21 11s
Raises the amount of magazines in the MP handgun cases to 6 Check for merge conflicts #18935: Pull request #5528 opened by Johannes2262
January 23, 2024 16:21 12s
January 23, 2024 16:21 12s
adds warning messages when CAS sonic boom happens and makes the boom fallof slower Check for merge conflicts #18934: Pull request #5410 synchronize by cuberound
January 23, 2024 16:01 11s
January 23, 2024 16:01 11s
adds warning messages when CAS sonic boom happens and makes the boom fallof slower Check for merge conflicts #18933: Pull request #5410 synchronize by cuberound
January 23, 2024 15:55 14s
January 23, 2024 15:55 14s
adds warning messages when CAS sonic boom happens and makes the boom fallof slower Check for merge conflicts #18932: Pull request #5410 synchronize by cuberound
January 23, 2024 15:53 14s
January 23, 2024 15:53 14s
adds warning messages when CAS sonic boom happens and makes the boom fallof slower Check for merge conflicts #18931: Pull request #5410 synchronize by cuberound
January 23, 2024 15:46 9s
January 23, 2024 15:46 9s
adds warning messages when CAS sonic boom happens and makes the boom fallof slower Check for merge conflicts #18930: Pull request #5410 synchronize by cuberound
January 23, 2024 15:45 14s
January 23, 2024 15:45 14s
adds warning messages when CAS sonic boom happens and makes the boom fallof slower Check for merge conflicts #18929: Pull request #5410 synchronize by cuberound
January 23, 2024 15:43 14s
January 23, 2024 15:43 14s
adds warning messages when CAS sonic boom happens and makes the boom fallof slower Check for merge conflicts #18928: Pull request #5410 ready_for_review by cuberound
January 23, 2024 14:56 10s
January 23, 2024 14:56 10s