Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
426 workflow run results
426 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Projectile smooth movement Check for merge conflicts #16636: Pull request #4986 opened by Doubleumc
November 21, 2023 00:26 15s
November 21, 2023 00:26 15s
Differentiates pylons in same area when spawning as lesser drone Check for merge conflicts #16635: Pull request #4985 synchronize by Birdtalon
November 20, 2023 22:11 20s
November 20, 2023 22:11 20s
/tg/ Status Effects Part 2 - datum, KD, KO, Stuns Check for merge conflicts #16634: Pull request #4842 synchronize by fira
November 20, 2023 22:05 8s
November 20, 2023 22:05 8s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16633: Pull request #4828 synchronize by fira
November 20, 2023 21:50 2m 48s
November 20, 2023 21:50 2m 48s
/tg/ Status Effects Part 2 - datum, KD, KO, Stuns Check for merge conflicts #16632: Pull request #4842 synchronize by fira
November 20, 2023 21:50 1m 6s
November 20, 2023 21:50 1m 6s
/tg/ Status Effects Part 2 - datum, KD, KO, Stuns Check for merge conflicts #16631: Pull request #4842 ready_for_review by fira
November 20, 2023 21:49 1m 42s
November 20, 2023 21:49 1m 42s
Adds explosion handling to experimental sensor tower Check for merge conflicts #16630: Pull request #4984 synchronize by Birdtalon
November 20, 2023 21:49 1m 4s
November 20, 2023 21:49 1m 4s
/tg/ Status Effects Part 2 - datum, KD, KO, Stuns Check for merge conflicts #16629: Pull request #4842 synchronize by fira
November 20, 2023 21:47 13s
November 20, 2023 21:47 13s
Differentiates pylons in same area when spawning as lesser drone Check for merge conflicts #16628: Pull request #4985 synchronize by Birdtalon
November 20, 2023 21:41 24s
November 20, 2023 21:41 24s
Differentiates pylons in same area when spawning as lesser drone Check for merge conflicts #16627: Pull request #4985 opened by Birdtalon
November 20, 2023 21:41 22s
November 20, 2023 21:41 22s
Adds explosion handling to experimental sensor tower Check for merge conflicts #16626: Pull request #4984 opened by Birdtalon
November 20, 2023 21:09 10s
November 20, 2023 21:09 10s
Mess tech scaling Check for merge conflicts #16625: Pull request #4983 synchronize by ghost
November 20, 2023 20:35 20s
November 20, 2023 20:35 20s
Mess tech scaling Check for merge conflicts #16624: Pull request #4983 synchronize by ghost
November 20, 2023 20:35 11s
November 20, 2023 20:35 11s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16623: Pull request #4828 synchronize by fira
November 20, 2023 20:31 13s
November 20, 2023 20:31 13s
Mess tech scaling Check for merge conflicts #16622: Pull request #4983 opened by ghost
November 20, 2023 20:01 14s
November 20, 2023 20:01 14s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16621: Pull request #4828 synchronize by fira
November 20, 2023 19:36 15s
November 20, 2023 19:36 15s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16620: Pull request #4828 synchronize by fira
November 20, 2023 19:07 19s
November 20, 2023 19:07 19s
Research fire chemicals buff Check for merge conflicts #16619: Pull request #4982 opened by SubjectD9341
November 20, 2023 18:34 14s
November 20, 2023 18:34 14s
Oppressor XvX nerf Check for merge conflicts #16618: Pull request #4981 synchronize by ihatethisengine
November 20, 2023 17:11 10s
November 20, 2023 17:11 10s
Oppressor XvX nerf Check for merge conflicts #16617: Pull request #4981 synchronize by ihatethisengine
November 20, 2023 17:01 10s
November 20, 2023 17:01 10s
Oppressor XvX nerf Check for merge conflicts #16616: Pull request #4981 synchronize by ihatethisengine
November 20, 2023 16:56 12s
November 20, 2023 16:56 12s
Oppressor XvX nerf Check for merge conflicts #16615: Pull request #4981 opened by ihatethisengine
November 20, 2023 16:54 16s
November 20, 2023 16:54 16s
More lifeboat launch options Check for merge conflicts #16614: Pull request #4976 ready_for_review by zzzmike
November 20, 2023 16:28 13s
November 20, 2023 16:28 13s
More lifeboat launch options Check for merge conflicts #16613: Pull request #4976 synchronize by zzzmike
November 20, 2023 16:16 15s
November 20, 2023 16:16 15s
More lifeboat launch options Check for merge conflicts #16612: Pull request #4976 synchronize by zzzmike
November 20, 2023 16:04 13s
November 20, 2023 16:04 13s