Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
10,633 workflow run results
10,633 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Adds Shockwaves to Explosions and Xeno Screeches Check for merge conflicts #21828: Pull request #5938 synchronize by GrrrKitten
April 21, 2024 13:02 10s
April 21, 2024 13:02 10s
Adds Shockwaves to Explosions and Xeno Screeches Check for merge conflicts #21827: Pull request #5938 synchronize by GrrrKitten
April 21, 2024 13:02 10s
April 21, 2024 13:02 10s
Isaac's Lament is so back baby!! (WIP) Check for merge conflicts #21826: Pull request #5961 synchronize by BadAtThisGame302
April 21, 2024 10:27 12s
April 21, 2024 10:27 12s
Falling Falcons: Paratroopers Edition Check for merge conflicts #21825: Pull request #6150 ready_for_review by ihatethisengine
April 21, 2024 09:26 14s
April 21, 2024 09:26 14s
Falling Falcons: Paratroopers Edition Check for merge conflicts #21824: Pull request #6150 synchronize by ihatethisengine
April 21, 2024 09:19 10s
April 21, 2024 09:19 10s
Falling Falcons: Paratroopers Edition Check for merge conflicts #21823: Pull request #6150 synchronize by ihatethisengine
April 21, 2024 09:13 10s
April 21, 2024 09:13 10s
Added ID Modification Log to the Access Report Print (#6124) Check for merge conflicts #21822: Commit 45489e6 pushed by github-merge-queue bot
April 21, 2024 07:33 4m 15s master
master
April 21, 2024 07:33 4m 15s
alt clicking a reagent tank will now toggle whether its dispensing or filling Check for merge conflicts #21821: Pull request #6176 synchronize by Drulikar
April 21, 2024 07:18 9s
April 21, 2024 07:18 9s
Fixes delaying round start not showing on the timer. (#6166) Check for merge conflicts #21820: Commit 1ca0f69 pushed by github-merge-queue bot
April 21, 2024 07:13 4m 15s master
master
April 21, 2024 07:13 4m 15s
Fixes delaying round start not showing on the timer. Check for merge conflicts #21819: Pull request #6166 synchronize by Drulikar
April 21, 2024 07:05 9s
April 21, 2024 07:05 9s
M540-B Armored Recon Carrier Check for merge conflicts #21818: Pull request #5401 synchronize by Zonespace27
April 21, 2024 06:16 11s
April 21, 2024 06:16 11s
alt clicking a reagent tank will now toggle whether its dispensing or filling Check for merge conflicts #21817: Pull request #6176 opened by iloveloopers
April 21, 2024 06:03 10s
April 21, 2024 06:03 10s
fixes high combustion napalm and sticky napalm working for OT assembl… Check for merge conflicts #21816: Commit ea50e9d pushed by github-merge-queue bot
April 21, 2024 04:30 4m 15s master
master
April 21, 2024 04:30 4m 15s
unbreaks binding to space (#6168) Check for merge conflicts #21815: Commit 6d12dfe pushed by github-merge-queue bot
April 21, 2024 04:23 4m 14s master
master
April 21, 2024 04:23 4m 14s
Unmarked admin tickets are automatically marked when responding to on… Check for merge conflicts #21814: Commit 06f8099 pushed by github-merge-queue bot
April 21, 2024 04:15 4m 15s master
master
April 21, 2024 04:15 4m 15s
Reverts #6040 (#6165) Check for merge conflicts #21813: Commit 96fdf71 pushed by github-merge-queue bot
April 21, 2024 04:08 4m 16s master
master
April 21, 2024 04:08 4m 16s
External Bleeding Sealing in Cryo Tubes Check for merge conflicts #21812: Pull request #6175 ready_for_review by Drulikar
April 21, 2024 00:46 11s
April 21, 2024 00:46 11s
External Bleeding Sealing in Cryo Tubes Check for merge conflicts #21811: Pull request #6175 opened by Drulikar
April 21, 2024 00:46 13s
April 21, 2024 00:46 13s
Adds an upgraded photocopier for the CL and CC Check for merge conflicts #21810: Pull request #6126 synchronize by LC4492
April 20, 2024 19:26 10s
April 20, 2024 19:26 10s
Adds an upgraded photocopier for the CL and CC Check for merge conflicts #21809: Pull request #6126 synchronize by LC4492
April 20, 2024 19:24 10s
April 20, 2024 19:24 10s
Adds an upgraded photocopier for the CL and CC Check for merge conflicts #21808: Pull request #6126 synchronize by LC4492
April 20, 2024 19:23 11s
April 20, 2024 19:23 11s
Adds an upgraded photocopier for the CL and CC Check for merge conflicts #21807: Pull request #6126 synchronize by LC4492
April 20, 2024 19:23 9s
April 20, 2024 19:23 9s
Adds an upgraded photocopier for the CL and CC Check for merge conflicts #21806: Pull request #6126 synchronize by LC4492
April 20, 2024 19:21 9s
April 20, 2024 19:21 9s
Adds an upgraded photocopier for the CL and CC Check for merge conflicts #21805: Pull request #6126 synchronize by LC4492
April 20, 2024 19:09 12s
April 20, 2024 19:09 12s
unbreaks binding to space Check for merge conflicts #21804: Pull request #6168 ready_for_review by harryob
April 20, 2024 18:38 9s
April 20, 2024 18:38 9s