Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
7,464 workflow run results
7,464 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Pried dropship's hatches cannot be locked again Check for merge conflicts #20084: Pull request #5808 synchronize by ihatethisengine
February 26, 2024 15:14 14s
February 26, 2024 15:14 14s
Pried dropship's hatches cannot be locked again Check for merge conflicts #20083: Pull request #5808 synchronize by ihatethisengine
February 26, 2024 15:14 11s
February 26, 2024 15:14 11s
Reenables Prison station Check for merge conflicts #20082: Pull request #5801 synchronize by Greg-Joffer
February 26, 2024 14:59 10s
February 26, 2024 14:59 10s
Reenables Prison station Check for merge conflicts #20081: Pull request #5801 synchronize by Greg-Joffer
February 26, 2024 14:53 15s
February 26, 2024 14:53 15s
Reenables Prison station Check for merge conflicts #20080: Pull request #5801 synchronize by Greg-Joffer
February 26, 2024 14:53 12s
February 26, 2024 14:53 12s
Adds both the surv CLs and the USCM CL to the WY Faction Check for merge conflicts #20079: Pull request #5819 opened by BadAtThisGame302
February 26, 2024 14:11 11s
February 26, 2024 14:11 11s
speeds up ci runs by 3 minutes (#5803) Check for merge conflicts #20078: Commit 96c1dbc pushed by github-merge-queue bot
February 26, 2024 13:02 2m 12s master
master
February 26, 2024 13:02 2m 12s
Reduces automatic research chemical contents property string (#5738) Check for merge conflicts #20077: Commit 0a04c89 pushed by github-merge-queue bot
February 26, 2024 12:52 4m 15s master
master
February 26, 2024 12:52 4m 15s
Balance : set base price for B12 to 30 and for the M4 to 20. (#5698) Check for merge conflicts #20076: Commit efccddb pushed by github-merge-queue bot
February 26, 2024 12:16 4m 15s master
master
February 26, 2024 12:16 4m 15s
(Slightly) Less confusing failure message for built-in visors (#5804) Check for merge conflicts #20075: Commit 405037d pushed by github-merge-queue bot
February 26, 2024 11:16 4m 16s master
master
February 26, 2024 11:16 4m 16s
Shiva's Panic Room Nightmare Insert (#5800) Check for merge conflicts #20074: Commit 9b28aa8 pushed by github-merge-queue bot
February 26, 2024 10:59 2m 12s master
master
February 26, 2024 10:59 2m 12s
Revert "Dropship turf direction sprites (#3642)" Check for merge conflicts #20073: Pull request #5817 opened by Drulikar
February 26, 2024 10:56 14s
February 26, 2024 10:56 14s
Tweaks oppressor (#5759) Check for merge conflicts #20072: Commit 55d7ea7 pushed by github-merge-queue bot
February 26, 2024 10:44 4m 15s master
master
February 26, 2024 10:44 4m 15s
Another good Sprite PR (#5681) Check for merge conflicts #20071: Commit 64d528e pushed by github-merge-queue bot
February 26, 2024 10:27 4m 15s master
master
February 26, 2024 10:27 4m 15s
Adds UA 45-F, UA 60-FP, M2C, M56D ammo to req Check for merge conflicts #20070: Pull request #5816 opened by Vicacrov
February 26, 2024 10:15 2m 17s
February 26, 2024 10:15 2m 17s
Dropship turf direction sprites (#3642) Check for merge conflicts #20069: Commit ec4ab3a pushed by github-merge-queue bot
February 26, 2024 10:13 4m 16s master
master
February 26, 2024 10:13 4m 16s
Map: Bigred change south lambda padlock and turned it into a checkpoint. Check for merge conflicts #20068: Pull request #5763 ready_for_review by Huffie56
February 26, 2024 09:01 9s
February 26, 2024 09:01 9s
adding vendors for maintenance technician Check for merge conflicts #20067: Pull request #5749 synchronize by Huffie56
February 26, 2024 08:51 10s
February 26, 2024 08:51 10s
Map: Bigred change south lambda padlock and turned it into a checkpoint. Check for merge conflicts #20066: Pull request #5763 synchronize by Huffie56
February 26, 2024 08:36 11s
February 26, 2024 08:36 11s
Pried dropship's hatches cannot be locked again Check for merge conflicts #20065: Pull request #5808 ready_for_review by ihatethisengine
February 26, 2024 04:40 58s
February 26, 2024 04:40 58s
Pried dropship's hatches cannot be locked again Check for merge conflicts #20064: Pull request #5808 synchronize by ihatethisengine
February 26, 2024 04:39 11s
February 26, 2024 04:39 11s
Updated XM43E1 for Sniper Spec Check for merge conflicts #20063: Pull request #5774 synchronize by Kaga-404
February 26, 2024 04:27 12s
February 26, 2024 04:27 12s
XM43E1 in regular gameplay Check for merge conflicts #20062: Pull request #5724 synchronize by Releasethesea
February 26, 2024 03:45 12s
February 26, 2024 03:45 12s
Pried dropship's hatches cannot be locked again Check for merge conflicts #20061: Pull request #5808 synchronize by ihatethisengine
February 26, 2024 02:28 12s
February 26, 2024 02:28 12s
Fixes Trading Card Descriptions Check for merge conflicts #20060: Pull request #5812 synchronize by Warfan1815
February 26, 2024 01:31 13s
February 26, 2024 01:31 13s