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,701 workflow run results
1,701 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Auxiliary Support Officer Check for merge conflicts #12971: Pull request #4081 opened by morrowwolf
August 1, 2023 23:54 12s
August 1, 2023 23:54 12s
Preds now show up on the predship tacmap Check for merge conflicts #12970: Pull request #4080 synchronize by Zonespace27
August 1, 2023 23:25 11s
August 1, 2023 23:25 11s
Preds now show up on the predship tacmap Check for merge conflicts #12969: Pull request #4080 opened by Zonespace27
August 1, 2023 23:11 13s
August 1, 2023 23:11 13s
Overwatch Console TGUI Refactor Check for merge conflicts #12968: Pull request #4078 synchronize by TheGamerdk
August 1, 2023 22:40 12s
August 1, 2023 22:40 12s
Fixes predator crew monitor console Check for merge conflicts #12967: Pull request #4079 opened by Zonespace27
August 1, 2023 22:27 12s
August 1, 2023 22:27 12s
Overwatch Console TGUI Refactor Check for merge conflicts #12966: Pull request #4078 synchronize by TheGamerdk
August 1, 2023 22:06 12s
August 1, 2023 22:06 12s
Falcon Drone appears on marine MD Check for merge conflicts #12965: Pull request #4057 ready_for_review by realforest2001
August 1, 2023 22:03 41s
August 1, 2023 22:03 41s
Falcon Drone appears on marine MD Check for merge conflicts #12964: Pull request #4057 synchronize by realforest2001
August 1, 2023 22:03 13s
August 1, 2023 22:03 13s
Overwatch Console TGUI Refactor Check for merge conflicts #12963: Pull request #4078 opened by TheGamerdk
August 1, 2023 22:02 12s
August 1, 2023 22:02 12s
Assigned job slots and cryorines. Check for merge conflicts #12962: Pull request #4076 opened by Segrain
August 1, 2023 21:11 12s
August 1, 2023 21:11 12s
Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #12961: Pull request #4003 synchronize by Zonespace27
August 1, 2023 20:42 1m 26s
August 1, 2023 20:42 1m 26s
Anchors the yautja carpnade Check for merge conflicts #12960: Pull request #4074 synchronize by Zonespace27
August 1, 2023 20:42 10s
August 1, 2023 20:42 10s
Standardize hugger attack windup and attack windup duration (#4044) Check for merge conflicts #12959: Commit eade039 pushed by github-merge-queue bot
August 1, 2023 20:31 4m 14s master
master
August 1, 2023 20:31 4m 14s
Anchors the yautja carpnade Check for merge conflicts #12958: Pull request #4074 synchronize by Zonespace27
August 1, 2023 20:15 2m 21s
August 1, 2023 20:15 2m 21s
Almayer control console tgui Check for merge conflicts #12957: Pull request #4066 synchronize by stanalbatross
August 1, 2023 20:09 6m 48s
August 1, 2023 20:09 6m 48s
HPR-addings (#4049) Check for merge conflicts #12956: Commit e2e244f pushed by github-merge-queue bot
August 1, 2023 20:05 2m 15s master
master
August 1, 2023 20:05 2m 15s
Almayer control console tgui Check for merge conflicts #12955: Pull request #4066 ready_for_review by stanalbatross
August 1, 2023 20:03 14s
August 1, 2023 20:03 14s
Almayer control console tgui Check for merge conflicts #12953: Pull request #4066 synchronize by stanalbatross
August 1, 2023 19:51 14s
August 1, 2023 19:51 14s
Fix for runner-lesserdrone collision. Check for merge conflicts #12952: Pull request #4075 opened by Segrain
August 1, 2023 19:18 16s
August 1, 2023 19:18 16s
Yautja Change Holder Check for merge conflicts #12951: Pull request #4063 synchronize by realforest2001
August 1, 2023 18:22 1m 33s
August 1, 2023 18:22 1m 33s
Yautja Legacy restoration & Yautja Sprite Fixes Check for merge conflicts #12950: Pull request #4033 synchronize by realforest2001
August 1, 2023 18:21 14s
August 1, 2023 18:21 14s
Falcon Drone appears on marine MD Check for merge conflicts #12949: Pull request #4057 ready_for_review by realforest2001
August 1, 2023 18:19 16s
August 1, 2023 18:19 16s
Falcon Drone appears on marine MD Check for merge conflicts #12948: Pull request #4057 synchronize by realforest2001
August 1, 2023 18:19 14s
August 1, 2023 18:19 14s
Anchors the yautja carpnade Check for merge conflicts #12947: Pull request #4074 opened by Zonespace27
August 1, 2023 18:04 15s
August 1, 2023 18:04 15s
Fixes brain surgery so it actually fixes your brain (#4061) Check for merge conflicts #12946: Commit 77c6999 pushed by github-merge-queue bot
August 1, 2023 17:36 4m 15s master
master
August 1, 2023 17:36 4m 15s