Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
5,610 workflow run results
5,610 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Sorokyne Tunnels Upgrade (#5020) Check for merge conflicts #16879: Commit a3e650e pushed by github-merge-queue bot
November 26, 2023 22:00 4m 17s master
master
November 26, 2023 22:00 4m 17s
Repurposed nightmare insert + Lambda Changes Check for merge conflicts #16878: Pull request #5045 synchronize by BadAtThisGame302
November 26, 2023 21:30 3m 37s
November 26, 2023 21:30 3m 37s
Adds Latejoin scaling to Vendors and ASRS Check for merge conflicts #16877: Pull request #4939 synchronize by fira
November 26, 2023 21:29 2m 24s
November 26, 2023 21:29 2m 24s
Projectile smooth movement Check for merge conflicts #16876: Pull request #4986 synchronize by Doubleumc
November 26, 2023 21:27 1m 42s
November 26, 2023 21:27 1m 42s
Repurposed nightmare insert + Lambda Changes Check for merge conflicts #16875: Pull request #5045 opened by BadAtThisGame302
November 26, 2023 21:27 16s
November 26, 2023 21:27 16s
Makes the squad attachments vendor vend to hand (#5021) Check for merge conflicts #16874: Commit 0271b91 pushed by github-merge-queue bot
November 26, 2023 20:59 4m 18s master
master
November 26, 2023 20:59 4m 18s
Lesser drone CRASH hotfix (#5037) Check for merge conflicts #16873: Commit daf2383 pushed by github-merge-queue bot
November 26, 2023 20:46 4m 18s master
master
November 26, 2023 20:46 4m 18s
Character creation 'Preferred Armor' preview (#5033) Check for merge conflicts #16872: Commit 8112b59 pushed by github-merge-queue bot
November 26, 2023 20:32 4m 21s master
master
November 26, 2023 20:32 4m 21s
Fixes repaired vendor icons not updating (#5024) Check for merge conflicts #16871: Commit 7ddb7e8 pushed by github-merge-queue bot
November 26, 2023 20:15 4m 16s master
master
November 26, 2023 20:15 4m 16s
Refactor got handling infection stage and progess of the black goo disease Check for merge conflicts #16870: Pull request #5044 opened by Huffie56
November 26, 2023 20:07 2m 30s
November 26, 2023 20:07 2m 30s
Fix post-SD detonation timer (#5036) Check for merge conflicts #16869: Commit 59b25e0 pushed by github-merge-queue bot
November 26, 2023 20:01 4m 17s master
master
November 26, 2023 20:01 4m 17s
Fixes Hijack Dropship launch announcement alarm not turning off - Bwo… Check for merge conflicts #16868: Commit 5e2819e pushed by github-merge-queue bot
November 26, 2023 19:48 4m 19s master
master
November 26, 2023 19:48 4m 19s
CORSAT poddoor and LZ fixes (#5029) Check for merge conflicts #16867: Commit b7ab02b pushed by github-merge-queue bot
November 26, 2023 19:35 4m 17s master
master
November 26, 2023 19:35 4m 17s
Système d'énergie de commandement - 1 Check for merge conflicts #16866: Pull request #5011 synchronize by LC4492
November 26, 2023 17:24 17s
November 26, 2023 17:24 17s
Tutorial System: Retutorializing Check for merge conflicts #16865: Pull request #5030 synchronize by Zonespace27
November 26, 2023 17:10 10s
November 26, 2023 17:10 10s
Readds skull facemask and facepaint Check for merge conflicts #16864: Pull request #5042 opened by irakligabunia
November 26, 2023 09:16 14s
November 26, 2023 09:16 14s
bumps minimum compile version to 515.1609 Check for merge conflicts #16863: Pull request #4808 synchronize by harryob
November 26, 2023 06:24 10s
November 26, 2023 06:24 10s
bumps minimum compile version to 515.1609 Check for merge conflicts #16862: Pull request #4808 synchronize by harryob
November 26, 2023 06:17 11s
November 26, 2023 06:17 11s
bumps minimum compile version to 515.1609 Check for merge conflicts #16861: Pull request #4808 synchronize by harryob
November 26, 2023 05:46 13s
November 26, 2023 05:46 13s
bumps minimum compile version to 515.1609 Check for merge conflicts #16860: Pull request #4808 reopened by harryob
November 26, 2023 05:00 14s
November 26, 2023 05:00 14s
Automatic TGS DMAPI Update (#5040) Check for merge conflicts #16859: Commit 3296a8f pushed by harryob
November 26, 2023 03:39 2m 17s master
master
November 26, 2023 03:39 2m 17s
Survivor Job Additions + Some Minor Fixes Check for merge conflicts #16858: Pull request #4956 synchronize by BadAtThisGame302
November 26, 2023 00:56 15s
November 26, 2023 00:56 15s
Automatic TGS DMAPI Update Check for merge conflicts #16857: Pull request #5040 opened by cm13-github
November 26, 2023 00:53 14s
November 26, 2023 00:53 14s
Kutjevo - South Caves Spring Check for merge conflicts #16856: Pull request #5039 synchronize by HeresKozmos
November 26, 2023 00:04 13s
November 26, 2023 00:04 13s
Kutjevo - South Caves Spring Check for merge conflicts #16855: Pull request #5039 opened by HeresKozmos
November 25, 2023 23:59 13s
November 25, 2023 23:59 13s