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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix UPP Hostile ERT Not Spawning With Gun (#4313) Check for merge conflicts #14221: Commit 83b949f pushed by github-merge-queue bot
September 6, 2023 17:03 4m 16s master
master
September 6, 2023 17:03 4m 16s
Fix UPP Hostile ERT Not Spawning With Gun Check for merge conflicts #14220: Pull request #4313 synchronize by Steelpoint
September 6, 2023 15:38 14s
September 6, 2023 15:38 14s
Null reference fix for full auto (#4340) Check for merge conflicts #14219: Commit c79e35c pushed by github-merge-queue bot
September 6, 2023 15:30 4m 21s master
master
September 6, 2023 15:30 4m 21s
moves full auto guns to be full auto by default (#4335) Check for merge conflicts #14218: Commit 5290262 pushed by github-merge-queue bot
September 6, 2023 05:56 4m 19s master
master
September 6, 2023 05:56 4m 19s
M707 "Vulture" Anti-Materiel Rifle Check for merge conflicts #14217: Pull request #4253 synchronize by Zonespace27
September 6, 2023 04:21 12s
September 6, 2023 04:21 12s
Uncommented "Observe" verb Check for merge conflicts #14216: Pull request #4345 ready_for_review by BeagleGaming1
September 6, 2023 01:10 2m 17s
September 6, 2023 01:10 2m 17s
Uncommented "Observe" verb Check for merge conflicts #14215: Pull request #4345 synchronize by BeagleGaming1
September 6, 2023 00:49 12s
September 6, 2023 00:49 12s
Uncommented "Observe" verb Check for merge conflicts #14214: Pull request #4345 opened by BeagleGaming1
September 6, 2023 00:46 16s
September 6, 2023 00:46 16s
Maybe fixes an issue with burst firing Check for merge conflicts #14213: Pull request #4344 opened by Zonespace27
September 6, 2023 00:40 16s
September 6, 2023 00:40 16s
Gives the M56D full auto Check for merge conflicts #14212: Pull request #4336 synchronize by Zonespace27
September 5, 2023 22:37 13s
September 5, 2023 22:37 13s
Royal Marines Commando Check for merge conflicts #14211: Pull request #4098 synchronize by spartanbobby
September 5, 2023 19:07 14s
September 5, 2023 19:07 14s
Adds CBRN ERT Check for merge conflicts #14210: Pull request #4337 synchronize by BeagleGaming1
September 5, 2023 17:15 14s
September 5, 2023 17:15 14s
For the Hive! ghost notification (#4329) Check for merge conflicts #14209: Commit 9a07432 pushed by github-merge-queue bot
September 5, 2023 15:50 4m 17s master
master
September 5, 2023 15:50 4m 17s
Fix carrier mutation sprite update (#4298) Check for merge conflicts #14208: Commit ce53a89 pushed by github-merge-queue bot
September 5, 2023 15:31 2m 19s master
master
September 5, 2023 15:31 2m 19s
Adds Custom External Webbing For IO | L-Armour To IO Vendor Check for merge conflicts #14207: Pull request #4341 opened by Steelpoint
September 5, 2023 15:25 34s
September 5, 2023 15:25 34s
Move xeno grab cooldown change to just ctrl+click logic (#4246) Check for merge conflicts #14206: Commit 73355dc pushed by github-merge-queue bot
September 5, 2023 11:16 4m 17s master
master
September 5, 2023 11:16 4m 17s
Null reference fix for full auto Check for merge conflicts #14205: Pull request #4340 opened by morrowwolf
September 5, 2023 11:01 14s
September 5, 2023 11:01 14s
Fix hugger/lesser drone time of death bypass (#4334) Check for merge conflicts #14204: Commit 4f28269 pushed by github-merge-queue bot
September 5, 2023 10:18 4m 20s master
master
September 5, 2023 10:18 4m 20s
Gives the M56D full auto Check for merge conflicts #14203: Pull request #4336 synchronize by Zonespace27
September 5, 2023 04:51 18s
September 5, 2023 04:51 18s
Gives the M56D full auto Check for merge conflicts #14202: Pull request #4336 synchronize by Zonespace27
September 5, 2023 04:46 1m 58s
September 5, 2023 04:46 1m 58s
Gives the M56D full auto Check for merge conflicts #14201: Pull request #4336 synchronize by Zonespace27
September 5, 2023 04:44 47s
September 5, 2023 04:44 47s
Adds CBRN ERT Check for merge conflicts #14200: Pull request #4337 ready_for_review by BeagleGaming1
September 5, 2023 03:03 14s
September 5, 2023 03:03 14s
Adds CBRN ERT Check for merge conflicts #14199: Pull request #4337 synchronize by BeagleGaming1
September 5, 2023 02:53 13s
September 5, 2023 02:53 13s
Adds CBRN ERT Check for merge conflicts #14198: Pull request #4337 synchronize by BeagleGaming1
September 5, 2023 02:38 17s
September 5, 2023 02:38 17s
Adds CBRN ERT Check for merge conflicts #14197: Pull request #4337 synchronize by BeagleGaming1
September 5, 2023 02:32 52s
September 5, 2023 02:32 52s