Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,162 workflow run results
1,162 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Yautja cloak changes Check for merge conflicts #12292: Pull request #3757 ready_for_review by realforest2001
July 19, 2023 13:15 5m 1s
July 19, 2023 13:15 5m 1s
Yautja cloak changes Check for merge conflicts #12291: Pull request #3757 synchronize by realforest2001
July 19, 2023 13:15 4m 2s
July 19, 2023 13:15 4m 2s
Admin Flag for Disposal mobs Check for merge conflicts #12290: Pull request #3814 synchronize by realforest2001
July 19, 2023 13:14 10s
July 19, 2023 13:14 10s
Admin Flag for Disposal mobs Check for merge conflicts #12289: Pull request #3814 ready_for_review by realforest2001
July 19, 2023 13:14 2m 13s
July 19, 2023 13:14 2m 13s
Yautja emote panel Check for merge conflicts #12288: Pull request #3906 ready_for_review by realforest2001
July 19, 2023 12:55 1m 46s
July 19, 2023 12:55 1m 46s
Yautja emote panel Check for merge conflicts #12287: Pull request #3906 synchronize by realforest2001
July 19, 2023 12:55 1m 36s
July 19, 2023 12:55 1m 36s
Point Cost Reduction for Multi-purpose area denial sentry Check for merge conflicts #12286: Pull request #3937 opened by Ben10083
July 19, 2023 12:54 1m 50s
July 19, 2023 12:54 1m 50s
Yautja Bracer lock toggle & SD message Check for merge conflicts #12285: Pull request #3907 ready_for_review by realforest2001
July 19, 2023 12:44 2m 33s
July 19, 2023 12:44 2m 33s
Yautja Bracer lock toggle & SD message Check for merge conflicts #12284: Pull request #3907 synchronize by realforest2001
July 19, 2023 12:44 11s
July 19, 2023 12:44 11s
You now lose hiding when melee attacking Check for merge conflicts #12283: Pull request #3902 synchronize by Ben10083
July 19, 2023 12:43 2m 14s
July 19, 2023 12:43 2m 14s
You now lose hiding when melee attacking Check for merge conflicts #12282: Pull request #3902 ready_for_review by Ben10083
July 19, 2023 12:43 2m 17s
July 19, 2023 12:43 2m 17s
Removes Rejuvinate and adds restricted proc logs (#3853) Check for merge conflicts #12281: Commit 1e458e8 pushed by github-merge-queue bot
July 19, 2023 12:08 2m 15s master
master
July 19, 2023 12:08 2m 15s
Update squad vendors reduce numbers of items for squad and increase it for requisition. Check for merge conflicts #12280: Pull request #3912 ready_for_review by Huffie56
July 19, 2023 12:01 1m 19s
July 19, 2023 12:01 1m 19s
Update squad vendors reduce numbers of items for squad and increase it for requisition. Check for merge conflicts #12279: Pull request #3912 synchronize by Huffie56
July 19, 2023 12:01 1m 11s
July 19, 2023 12:01 1m 11s
New UPP guns Check for merge conflicts #12278: Pull request #3865 synchronize by CapCamIII
July 19, 2023 11:33 33s
July 19, 2023 11:33 33s
New UPP guns Check for merge conflicts #12277: Pull request #3865 synchronize by CapCamIII
July 19, 2023 11:30 10s
July 19, 2023 11:30 10s
New UPP guns Check for merge conflicts #12276: Pull request #3865 synchronize by CapCamIII
July 19, 2023 11:29 12s
July 19, 2023 11:29 12s
Update squad vendors reduce numbers of items for squad and increase it for requisition. Check for merge conflicts #12275: Pull request #3912 synchronize by Huffie56
July 19, 2023 10:59 4m 54s
July 19, 2023 10:59 4m 54s
Makes the speed for an embryo to burst a config + embryo buff (#3844) Check for merge conflicts #12274: Commit 61dcea5 pushed by github-merge-queue bot
July 19, 2023 10:48 5m 5s master
master
July 19, 2023 10:48 5m 5s
Yautja Bracer lock toggle & SD message Check for merge conflicts #12273: Pull request #3907 synchronize by realforest2001
July 19, 2023 10:47 5m 53s
July 19, 2023 10:47 5m 53s
Yautja Bracer lock toggle & SD message Check for merge conflicts #12272: Pull request #3907 ready_for_review by realforest2001
July 19, 2023 10:47 6m 24s
July 19, 2023 10:47 6m 24s
Yautja emote panel Check for merge conflicts #12271: Pull request #3906 synchronize by realforest2001
July 19, 2023 10:46 5m 2s
July 19, 2023 10:46 5m 2s
Yautja Bracer lock toggle & SD message Check for merge conflicts #12270: Pull request #3907 synchronize by realforest2001
July 19, 2023 10:41 2m 38s
July 19, 2023 10:41 2m 38s
Fixes doubling of gadget points for second+ synth Check for merge conflicts #12269: Pull request #3936 opened by Katskan
July 19, 2023 10:34 11s
July 19, 2023 10:34 11s
[Experimental] Modifies INTERRUPT_NO_NEEDHAND flag Check for merge conflicts #12268: Pull request #3935 opened by morrowwolf
July 19, 2023 10:20 13s
July 19, 2023 10:20 13s