Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,302 workflow run results
2,302 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Adds drawing to tacmaps Check for merge conflicts #14939: Pull request #4475 synchronize by ghost
September 29, 2023 15:00 16s
September 29, 2023 15:00 16s
Removes more clown gear (#4532) Check for merge conflicts #14938: Commit 11a9e8e pushed by github-merge-queue bot
September 29, 2023 09:41 4m 16s master
master
September 29, 2023 09:41 4m 16s
Fixes taking control of crit xenos (#4536) Check for merge conflicts #14937: Commit b9c217b pushed by github-merge-queue bot
September 29, 2023 09:27 4m 16s master
master
September 29, 2023 09:27 4m 16s
Fixes grab delay after performing an action Check for merge conflicts #14936: Pull request #4494 synchronize by Git-Nivrak
September 29, 2023 07:53 14s
September 29, 2023 07:53 14s
Minor QOL Buff To Handheld Crew Monitor Check for merge conflicts #14935: Pull request #4545 opened by Steelpoint
September 29, 2023 06:36 14s
September 29, 2023 06:36 14s
Adds drawing to tacmaps Check for merge conflicts #14934: Pull request #4475 synchronize by ghost
September 29, 2023 05:55 11s
September 29, 2023 05:55 11s
Adds drawing to tacmaps Check for merge conflicts #14933: Pull request #4475 synchronize by ghost
September 29, 2023 05:30 12s
September 29, 2023 05:30 12s
Adds drawing to tacmaps Check for merge conflicts #14932: Pull request #4475 synchronize by ghost
September 29, 2023 04:30 15s
September 29, 2023 04:30 15s
Adds drawing to tacmaps Check for merge conflicts #14931: Pull request #4475 synchronize by ghost
September 29, 2023 04:26 13s
September 29, 2023 04:26 13s
Adds drawing to tacmaps Check for merge conflicts #14930: Pull request #4475 synchronize by ghost
September 29, 2023 04:18 12s
September 29, 2023 04:18 12s
Adds drawing to tacmaps Check for merge conflicts #14929: Pull request #4475 synchronize by ghost
September 29, 2023 04:15 15s
September 29, 2023 04:15 15s
Adds drawing to tacmaps Check for merge conflicts #14928: Pull request #4475 synchronize by ghost
September 29, 2023 04:10 11s
September 29, 2023 04:10 11s
Adds drawing to tacmaps Check for merge conflicts #14927: Pull request #4475 synchronize by ghost
September 29, 2023 04:04 12s
September 29, 2023 04:04 12s
Adds drawing to tacmaps Check for merge conflicts #14926: Pull request #4475 synchronize by ghost
September 29, 2023 03:58 11s
September 29, 2023 03:58 11s
Working Joe Voiceline FIx Check for merge conflicts #14925: Pull request #4544 opened by Ben10083
September 29, 2023 03:41 2m 19s
September 29, 2023 03:41 2m 19s
Removes more clown gear Check for merge conflicts #14924: Pull request #4532 synchronize by morrowwolf
September 28, 2023 21:22 13s
September 28, 2023 21:22 13s
[QOL] You can acid things on surfaces Check for merge conflicts #14923: Pull request #4542 opened by TeDGamer
September 28, 2023 21:03 12s
September 28, 2023 21:03 12s
Colonial Marshals in Distress! CMB Handheld Distress Beacon Check for merge conflicts #14922: Pull request #4540 synchronize by QuickLode
September 28, 2023 20:40 11s
September 28, 2023 20:40 11s
Allows M46C to take rubber munitions Check for merge conflicts #14921: Pull request #4541 opened by QuickLode
September 28, 2023 20:33 13s
September 28, 2023 20:33 13s
Colonial Marshals in Distress! CMB Handheld Distress Beacon Check for merge conflicts #14920: Pull request #4540 synchronize by QuickLode
September 28, 2023 20:26 1m 26s
September 28, 2023 20:26 1m 26s
Colonial Marshals in Distress! CMB Handheld Distress Beacon Check for merge conflicts #14919: Pull request #4540 synchronize by QuickLode
September 28, 2023 20:24 1m 22s
September 28, 2023 20:24 1m 22s
Colonial Marshals in Distress! CMB Handheld Distress Beacon Check for merge conflicts #14918: Pull request #4540 opened by QuickLode
September 28, 2023 20:23 31s
September 28, 2023 20:23 31s
Squad Briefings 2: The Briefening Check for merge conflicts #14917: Pull request #4539 opened by Warfan1815
September 28, 2023 20:20 16s
September 28, 2023 20:20 16s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14916: Pull request #4531 synchronize by Warfan1815
September 28, 2023 20:09 18s
September 28, 2023 20:09 18s
refactor : divide survivor preset base on maps. (#4522) Check for merge conflicts #14915: Commit a8db871 pushed by github-merge-queue bot
September 28, 2023 19:03 4m 15s master
master
September 28, 2023 19:03 4m 15s