Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
855 workflow run results
855 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Admin Proc for Distress Signal TGUI and Fix Check for merge conflicts #13503: Pull request #4175 opened by Ben10083
August 12, 2023 23:19 2m 41s
August 12, 2023 23:19 2m 41s
More Xeno Alliances Tweaks (#4053) Check for merge conflicts #13502: Commit 87f2e5a pushed by github-merge-queue bot
August 12, 2023 23:16 4m 14s master
master
August 12, 2023 23:16 4m 14s
autowiki port and gun autowiki (#4107) Check for merge conflicts #13501: Commit e85d66a pushed by github-merge-queue bot
August 12, 2023 23:02 4m 17s master
master
August 12, 2023 23:02 4m 17s
Yautja Vision Changes (#4046) Check for merge conflicts #13500: Commit ae962a9 pushed by github-merge-queue bot
August 12, 2023 22:48 4m 19s master
master
August 12, 2023 22:48 4m 19s
Stops new specs using all gear (#4162) Check for merge conflicts #13499: Commit f5cbf75 pushed by github-merge-queue bot
August 12, 2023 22:34 4m 15s master
master
August 12, 2023 22:34 4m 15s
Yautja Vision Changes Check for merge conflicts #13498: Pull request #4046 synchronize by realforest2001
August 12, 2023 22:11 3m 27s
August 12, 2023 22:11 3m 27s
Yautja Change Holder Check for merge conflicts #13497: Pull request #4063 synchronize by realforest2001
August 12, 2023 22:11 2m 37s
August 12, 2023 22:11 2m 37s
Yautja Change Holder Check for merge conflicts #13496: Pull request #4063 synchronize by realforest2001
August 12, 2023 22:07 5m 49s
August 12, 2023 22:07 5m 49s
Yautja Vision Changes Check for merge conflicts #13495: Pull request #4046 synchronize by realforest2001
August 12, 2023 22:07 6m 1s
August 12, 2023 22:07 6m 1s
Yautja Change Holder Check for merge conflicts #13494: Pull request #4063 synchronize by realforest2001
August 12, 2023 22:05 14s
August 12, 2023 22:05 14s
Yautja Vision Changes Check for merge conflicts #13493: Pull request #4046 synchronize by realforest2001
August 12, 2023 22:05 13s
August 12, 2023 22:05 13s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13492: Pull request #4151 synchronize by harryob
August 12, 2023 21:41 14s
August 12, 2023 21:41 14s
Smurfing Queens (#4166) Check for merge conflicts #13491: Commit 1eebb2c pushed by github-merge-queue bot
August 12, 2023 21:33 4m 14s master
master
August 12, 2023 21:33 4m 14s
Fix you will no longer be able to feed without any limit with the fork. Check for merge conflicts #13490: Pull request #4174 ready_for_review by Huffie56
August 12, 2023 20:38 12s
August 12, 2023 20:38 12s
Fix you will no longer be able to feed without any limit with the fork. Check for merge conflicts #13489: Pull request #4174 opened by Huffie56
August 12, 2023 20:23 59s
August 12, 2023 20:23 59s
fix and small balance change to the utility vendor. Check for merge conflicts #13488: Pull request #4169 ready_for_review by Huffie56
August 12, 2023 20:21 11s
August 12, 2023 20:21 11s
Fix bug plant keep growing Check for merge conflicts #13487: Pull request #4173 synchronize by MikeKuwait
August 12, 2023 20:18 12s
August 12, 2023 20:18 12s
Fix bug plant keep growing Check for merge conflicts #13486: Pull request #4173 opened by MikeKuwait
August 12, 2023 20:17 12s
August 12, 2023 20:17 12s
Foxtrot cryomarines spawn as freed mobs if not taken Check for merge conflicts #13485: Pull request #4132 synchronize by ihatethisengine
August 12, 2023 18:57 28s
August 12, 2023 18:57 28s
Foxtrot cryomarines spawn as freed mobs if not taken Check for merge conflicts #13484: Pull request #4132 synchronize by ihatethisengine
August 12, 2023 18:56 11s
August 12, 2023 18:56 11s
Rounds oxyloss from bloodloss Check for merge conflicts #13483: Pull request #4172 opened by morrowwolf
August 12, 2023 17:18 14s
August 12, 2023 17:18 14s
More random slashes take two Check for merge conflicts #13482: Pull request #4171 opened by morrowwolf
August 12, 2023 16:42 13s
August 12, 2023 16:42 13s
Removes no-armor sentinel slow-spit insta-knockdown Check for merge conflicts #13481: Pull request #4170 opened by CapCamIII
August 12, 2023 16:34 12s
August 12, 2023 16:34 12s
Helmet Visors/Optics and built-in HUDs Check for merge conflicts #13480: Pull request #4156 synchronize by morrowwolf
August 12, 2023 14:56 14s
August 12, 2023 14:56 14s
Helmet Visors/Optics and built-in HUDs Check for merge conflicts #13479: Pull request #4156 synchronize by morrowwolf
August 12, 2023 13:51 12s
August 12, 2023 13:51 12s