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,201 workflow run results
2,201 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix remove iv needing power to operate. Check for merge conflicts #13346: Pull request #4070 ready_for_review by Drulikar
August 9, 2023 05:58 12s
August 9, 2023 05:58 12s
Fix runtime with hijack burrowed PR Check for merge conflicts #13345: Pull request #4144 opened by Drulikar
August 9, 2023 05:58 11s
August 9, 2023 05:58 11s
adds and rebalances items Check for merge conflicts #13344: Pull request #4103 ready_for_review by Dorodomki
August 9, 2023 05:53 12s
August 9, 2023 05:53 12s
Fix remove iv needing power to operate. Check for merge conflicts #13343: Pull request #4070 synchronize by Drulikar
August 9, 2023 05:42 12s
August 9, 2023 05:42 12s
adds and rebalances items Check for merge conflicts #13342: Pull request #4103 ready_for_review by Dorodomki
August 9, 2023 05:02 11s
August 9, 2023 05:02 11s
makes es4 use 88m4 belt icon Check for merge conflicts #13341: Pull request #4143 opened by realforest2001
August 9, 2023 05:00 13s
August 9, 2023 05:00 13s
Etool size buff (#4139) Check for merge conflicts #13340: Commit c6d70d4 pushed by github-merge-queue bot
August 9, 2023 03:25 4m 18s master
master
August 9, 2023 03:25 4m 18s
Across the board firerate nerfs (#4120) Check for merge conflicts #13339: Commit 20b21f7 pushed by github-merge-queue bot
August 9, 2023 03:12 4m 16s master
master
August 9, 2023 03:12 4m 16s
Fix remove iv needing power to operate. Check for merge conflicts #13338: Pull request #4070 synchronize by Drulikar
August 9, 2023 03:08 2m 13s
August 9, 2023 03:08 2m 13s
Yautja Weapon Gimmicks Check for merge conflicts #13337: Pull request #4047 synchronize by Zonespace27
August 8, 2023 20:30 14s
August 8, 2023 20:30 14s
Adds the Military Chaplain Check for merge conflicts #13336: Pull request #4142 synchronize by realforest2001
August 8, 2023 19:48 13s
August 8, 2023 19:48 13s
Faction Access & Almayer Security Overhaul Check for merge conflicts #13335: Pull request #4035 synchronize by realforest2001
August 8, 2023 18:59 12s
August 8, 2023 18:59 12s
Adds the Military Chaplain Check for merge conflicts #13334: Pull request #4142 opened by realforest2001
August 8, 2023 18:53 13s
August 8, 2023 18:53 13s
Adds vehicles skill to the Commanding Officer & Auxiliary Support Officer Check for merge conflicts #13333: Pull request #4140 ready_for_review by realforest2001
August 8, 2023 18:45 13s
August 8, 2023 18:45 13s
Adds vehicles skill to the Commanding Officer & Auxiliary Support Officer Check for merge conflicts #13332: Pull request #4140 synchronize by kirieee
August 8, 2023 18:35 14s
August 8, 2023 18:35 14s
Nerfs to defibrillators, changes to heart damage & bloodloss Check for merge conflicts #13331: Pull request #4137 synchronize by BeagleGaming1
August 8, 2023 18:33 15s
August 8, 2023 18:33 15s
Adds vehicles skill to the Commanding Officer & Auxiliary Support Officer Check for merge conflicts #13330: Pull request #4140 synchronize by kirieee
August 8, 2023 18:31 15s
August 8, 2023 18:31 15s
Changes 'Growing Queen' to 'Immature Queen' (#4138) Check for merge conflicts #13329: Commit 592d59d pushed by github-merge-queue bot
August 8, 2023 18:16 4m 26s master
master
August 8, 2023 18:16 4m 26s
Fix remove iv needing power to operate. Check for merge conflicts #13328: Pull request #4070 synchronize by realforest2001
August 8, 2023 18:03 1m 24s
August 8, 2023 18:03 1m 24s
Sniper - Updated Sprites Check for merge conflicts #13327: Pull request #4141 synchronize by Misttyy
August 8, 2023 18:03 13s
August 8, 2023 18:03 13s
Cmo research qol (#4135) Check for merge conflicts #13326: Commit bef6a83 pushed by github-merge-queue bot
August 8, 2023 17:13 4m 18s master
master
August 8, 2023 17:13 4m 18s
updating MP and warden vendors. adding handgun case. Check for merge conflicts #13325: Pull request #4007 synchronize by Huffie56
August 8, 2023 16:44 13s
August 8, 2023 16:44 13s
Sniper - Updated Sprites Check for merge conflicts #13324: Pull request #4141 synchronize by Misttyy
August 8, 2023 16:37 15s
August 8, 2023 16:37 15s
Sniper - Updated Sprites Check for merge conflicts #13323: Pull request #4141 opened by Misttyy
August 8, 2023 16:34 17s
August 8, 2023 16:34 17s
updating MP and warden vendors. adding handgun case. Check for merge conflicts #13322: Pull request #4007 synchronize by Huffie56
August 8, 2023 16:32 14s
August 8, 2023 16:32 14s