Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
8,933 workflow run results
8,933 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix dropship equipment infinite loop Check for merge conflicts #20109: Pull request #5823 opened by mullenpaul
February 26, 2024 20:08 11s
February 26, 2024 20:08 11s
adds stun to exiting maintenance stations Check for merge conflicts #20108: Pull request #5822 opened by LOK-1SmartRifleEnjoyer
February 26, 2024 19:30 21s
February 26, 2024 19:30 21s
Pried dropship's hatches cannot be locked again Check for merge conflicts #20107: Pull request #5808 ready_for_review by ihatethisengine
February 26, 2024 18:54 3m 0s
February 26, 2024 18:54 3m 0s
Adds CLF TL to the crashed ship & updates some intro-texts for crashed ship & PMC spawns Check for merge conflicts #20106: Pull request #5813 synchronize by Foxtrot13224
February 26, 2024 17:46 12s
February 26, 2024 17:46 12s
Project ARES TM Holder (v4) Check for merge conflicts #20105: Pull request #5007 synchronize by realforest2001
February 26, 2024 17:18 11s
February 26, 2024 17:18 11s
Project ARES: AI Core Makeover Check for merge conflicts #20104: Pull request #5821 synchronize by realforest2001
February 26, 2024 17:17 15s
February 26, 2024 17:17 15s
Project ARES: AI Core Makeover Check for merge conflicts #20103: Pull request #5821 opened by realforest2001
February 26, 2024 17:14 11s
February 26, 2024 17:14 11s
XM43E1 in regular gameplay Check for merge conflicts #20102: Pull request #5724 synchronize by Releasethesea
February 26, 2024 17:06 13s
February 26, 2024 17:06 13s
Project ARES TM Holder (v4) Check for merge conflicts #20101: Pull request #5007 synchronize by realforest2001
February 26, 2024 17:06 14s
February 26, 2024 17:06 14s
XM43E1 in regular gameplay Check for merge conflicts #20100: Pull request #5724 synchronize by Releasethesea
February 26, 2024 16:58 11s
February 26, 2024 16:58 11s
Project ARES: Admin Console Check for merge conflicts #20099: Pull request #4182 synchronize by realforest2001
February 26, 2024 16:56 20s
February 26, 2024 16:56 20s
Project ARES: Admin Console Check for merge conflicts #20098: Pull request #4182 ready_for_review by realforest2001
February 26, 2024 16:54 14s
February 26, 2024 16:54 14s
Project ARES: Admin Console Check for merge conflicts #20097: Pull request #4182 synchronize by realforest2001
February 26, 2024 16:54 16s
February 26, 2024 16:54 16s
Project ARES: Admin Console Check for merge conflicts #20096: Pull request #4182 synchronize by realforest2001
February 26, 2024 16:53 11s
February 26, 2024 16:53 11s
Project ARES: Added Tech Unlock logs Check for merge conflicts #20094: Pull request #5006 synchronize by realforest2001
February 26, 2024 16:49 35s
February 26, 2024 16:49 35s
Project ARES: Added Tech Unlock logs Check for merge conflicts #20095: Pull request #5006 ready_for_review by realforest2001
February 26, 2024 16:49 43s
February 26, 2024 16:49 43s
Project ARES: Ticket Notifications Check for merge conflicts #20093: Pull request #5510 ready_for_review by realforest2001
February 26, 2024 16:47 11s
February 26, 2024 16:47 11s
Project ARES: Ticket Notifications Check for merge conflicts #20092: Pull request #5510 synchronize by realforest2001
February 26, 2024 16:47 13s
February 26, 2024 16:47 13s
Fixes traps triggering when shuttlecrushed Check for merge conflicts #20091: Pull request #5820 synchronize by Vicacrov
February 26, 2024 16:20 13s
February 26, 2024 16:20 13s
Fixes traps triggering when shuttlecrushed Check for merge conflicts #20090: Pull request #5820 opened by Vicacrov
February 26, 2024 16:10 13s
February 26, 2024 16:10 13s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20089: Pull request #5784 synchronize by GrrrKitten
February 26, 2024 16:07 15s
February 26, 2024 16:07 15s
XM43E1 in regular gameplay Check for merge conflicts #20088: Pull request #5724 synchronize by Releasethesea
February 26, 2024 16:03 19s
February 26, 2024 16:03 19s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20087: Pull request #5784 synchronize by GrrrKitten
February 26, 2024 15:49 15s
February 26, 2024 15:49 15s
adding vendors for maintenance technician (#5749) Check for merge conflicts #20086: Commit 62ef80e pushed by github-merge-queue bot
February 26, 2024 15:46 4m 14s master
master
February 26, 2024 15:46 4m 14s
adding vendors for maintenance technician Check for merge conflicts #20085: Pull request #5749 synchronize by Huffie56
February 26, 2024 15:22 13s
February 26, 2024 15:22 13s