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

Updated XM43E1 for Sniper Spec Check for merge conflicts #20159: Pull request #5774 synchronize by Kaga-404
February 27, 2024 10:29 14s
February 27, 2024 10:29 14s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20158: Pull request #5784 synchronize by GrrrKitten
February 27, 2024 10:14 14s
February 27, 2024 10:14 14s
Balance: adding option to buy more ammunition type and change how fuel tank pouch is destributed Check for merge conflicts #20157: Pull request #5839 opened by Huffie56
February 27, 2024 10:10 13s
February 27, 2024 10:10 13s
Updated XM43E1 for Sniper Spec Check for merge conflicts #20156: Pull request #5774 synchronize by Kaga-404
February 27, 2024 10:05 21s
February 27, 2024 10:05 21s
Dynamic price for omnisentryguns round 3 Check for merge conflicts #20155: Pull request #5702 synchronize by cuberound
February 27, 2024 08:44 10s
February 27, 2024 08:44 10s
Dynamic price for omnisentryguns round 3 Check for merge conflicts #20154: Pull request #5702 ready_for_review by cuberound
February 27, 2024 08:44 11s
February 27, 2024 08:44 11s
Resprites - 2/2024 Edition Check for merge conflicts #20153: Pull request #5838 synchronize by nauticall
February 27, 2024 07:40 16s
February 27, 2024 07:40 16s
Resprites - 2/2024 Edition Check for merge conflicts #20152: Pull request #5838 synchronize by nauticall
February 27, 2024 06:41 13s
February 27, 2024 06:41 13s
Resprites - 2/2024 Edition Check for merge conflicts #20151: Pull request #5838 synchronize by nauticall
February 27, 2024 06:24 9s
February 27, 2024 06:24 9s
Resprites - 2/2024 Edition Check for merge conflicts #20150: Pull request #5838 opened by nauticall
February 27, 2024 06:03 15s
February 27, 2024 06:03 15s
Reverts Removal of M4 Armor From FTL Check for merge conflicts #20149: Pull request #5834 synchronize by MobiusWon
February 27, 2024 05:34 15s
February 27, 2024 05:34 15s
XM43E1 in regular gameplay Check for merge conflicts #20148: Pull request #5724 synchronize by Releasethesea
February 27, 2024 05:05 11s
February 27, 2024 05:05 11s
Tactical Compact Nailgun Check for merge conflicts #20147: Pull request #5746 synchronize by MobiusWon
February 27, 2024 04:27 10s
February 27, 2024 04:27 10s
TWE on Who. Check for merge conflicts #20146: Pull request #5837 opened by Segrain
February 27, 2024 03:37 17s
February 27, 2024 03:37 17s
Fix for fisticuffs causedata. Check for merge conflicts #20145: Pull request #5836 opened by Segrain
February 27, 2024 03:18 11s
February 27, 2024 03:18 11s
Adds CLF TL to the crashed ship & updates some intro-texts for crashed ship & PMC spawns Check for merge conflicts #20144: Pull request #5813 synchronize by Foxtrot13224
February 27, 2024 02:46 10s
February 27, 2024 02:46 10s
Adds CLF TL to the crashed ship & updates some intro-texts for crashed ship & PMC spawns Check for merge conflicts #20143: Pull request #5813 synchronize by Foxtrot13224
February 27, 2024 02:44 12s
February 27, 2024 02:44 12s
Fix for crates and traps. Check for merge conflicts #20142: Pull request #5835 opened by Segrain
February 27, 2024 02:14 12s
February 27, 2024 02:14 12s
Admin Verbs - Hide now hides Control Mob verb (#5827) Check for merge conflicts #20141: Commit 86292ac pushed by github-merge-queue bot
February 27, 2024 01:56 4m 13s master
master
February 27, 2024 01:56 4m 13s
Tactical Compact Nailgun Check for merge conflicts #20140: Pull request #5746 ready_for_review by MobiusWon
February 27, 2024 01:43 10s
February 27, 2024 01:43 10s
Pried dropship's hatches cannot be locked again (#5808) Check for merge conflicts #20139: Commit 5f5f15f pushed by github-merge-queue bot
February 27, 2024 01:37 4m 13s master
master
February 27, 2024 01:37 4m 13s
Reverts Removal of M4 Armor From FTL Check for merge conflicts #20138: Pull request #5834 ready_for_review by MobiusWon
February 27, 2024 01:34 20s
February 27, 2024 01:34 20s
Reverts Removal of M4 Armor From FTL Check for merge conflicts #20137: Pull request #5834 opened by MobiusWon
February 27, 2024 01:29 16s
February 27, 2024 01:29 16s
Brig Area Update/Refactor (#5723) Check for merge conflicts #20136: Commit 6533f9c pushed by github-merge-queue bot
February 27, 2024 01:25 4m 14s master
master
February 27, 2024 01:25 4m 14s
Fixes acid pillars shooting captured humans (#5807) Check for merge conflicts #20135: Commit af72122 pushed by github-merge-queue bot
February 27, 2024 01:14 4m 16s master
master
February 27, 2024 01:14 4m 16s