Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
3,805 workflow run results
3,805 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

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
refactor : Cleaning specialist.dm file Check for merge conflicts #14914: Pull request #4538 ready_for_review by Huffie56
September 28, 2023 18:40 12s
September 28, 2023 18:40 12s
refactor : Cleaning specialist.dm file Check for merge conflicts #14913: Pull request #4538 opened by Huffie56
September 28, 2023 18:32 13s
September 28, 2023 18:32 13s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14912: Pull request #4531 synchronize by Warfan1815
September 28, 2023 17:56 17s
September 28, 2023 17:56 17s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14911: Pull request #4531 synchronize by Warfan1815
September 28, 2023 17:33 15s
September 28, 2023 17:33 15s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14910: Pull request #4531 synchronize by Warfan1815
September 28, 2023 17:33 14s
September 28, 2023 17:33 14s
Whiskey Outpost vote fix (#4525) Check for merge conflicts #14909: Commit 6628064 pushed by github-merge-queue bot
September 28, 2023 16:59 4m 14s master
master
September 28, 2023 16:59 4m 14s
Almayer: Dirty Up The Ship (Revival) Check for merge conflicts #14908: Pull request #4476 synchronize by Steelpoint
September 28, 2023 15:13 15s
September 28, 2023 15:13 15s
TGUI: Microwave Check for merge conflicts #14907: Pull request #4523 synchronize by Crowbar764
September 28, 2023 11:43 15s
September 28, 2023 11:43 15s
TGUI: Microwave Check for merge conflicts #14906: Pull request #4523 synchronize by Crowbar764
September 28, 2023 11:35 12s
September 28, 2023 11:35 12s
Resin Fruits now contain enough fruit resin to be scanned. Alacrit now contains catecholamine plasma Check for merge conflicts #14905: Pull request #4425 synchronize by private-tristan
September 28, 2023 10:23 19s
September 28, 2023 10:23 19s
refactor : divide survivor preset base on maps. Check for merge conflicts #14904: Pull request #4522 ready_for_review by Huffie56
September 28, 2023 09:35 13s
September 28, 2023 09:35 13s
refactor : divide survivor preset base on maps. Check for merge conflicts #14903: Pull request #4522 synchronize by Huffie56
September 28, 2023 09:35 15s
September 28, 2023 09:35 15s
"Do nothing" dual wield preference (#4504) Check for merge conflicts #14902: Commit 54cab1d pushed by github-merge-queue bot
September 28, 2023 09:29 4m 14s master
master
September 28, 2023 09:29 4m 14s
Additional Working Joe Voicelines (#4501) Check for merge conflicts #14901: Commit 8cad63f pushed by github-merge-queue bot
September 28, 2023 09:14 4m 19s master
master
September 28, 2023 09:14 4m 19s