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,103 workflow run results
8,103 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

M540-B Armored Recon Carrier Check for merge conflicts #20843: Pull request #5401 synchronize by Zonespace27
March 23, 2024 23:45 11s
March 23, 2024 23:45 11s
Fortune Changes (#5994) Check for merge conflicts #20842: Commit 7d1be4d pushed by github-merge-queue bot
March 23, 2024 23:29 4m 14s master
master
March 23, 2024 23:29 4m 14s
Fixes delayed launch launching lifeboat even if locked by queen (#5980) Check for merge conflicts #20841: Commit 761c11d pushed by github-merge-queue bot
March 23, 2024 23:22 4m 14s master
master
March 23, 2024 23:22 4m 14s
Fix for Marsoc spawnpoint. (#5956) Check for merge conflicts #20840: Commit 2ad030b pushed by github-merge-queue bot
March 23, 2024 23:14 4m 12s master
master
March 23, 2024 23:14 4m 12s
XM43E1 in regular gameplay Check for merge conflicts #20839: Pull request #5724 synchronize by Releasethesea
March 23, 2024 21:30 10s
March 23, 2024 21:30 10s
M540-B Armored Recon Carrier Check for merge conflicts #20838: Pull request #5401 synchronize by Zonespace27
March 23, 2024 21:21 10s
March 23, 2024 21:21 10s
M540-B Armored Recon Carrier Check for merge conflicts #20837: Pull request #5401 synchronize by Zonespace27
March 23, 2024 21:03 10s
March 23, 2024 21:03 10s
incendiary minirocket price reduce Check for merge conflicts #20836: Pull request #5995 opened by cuberound
March 23, 2024 18:48 11s
March 23, 2024 18:48 11s
Fix,update CLF ERT Station. fix space tile and missing platform. Check for merge conflicts #20835: Pull request #5992 ready_for_review by Huffie56
March 23, 2024 07:23 13s
March 23, 2024 07:23 13s
[FIX,MAP] move semiotic in north evac pod so you can't see it when your behind in hull maintenance. Check for merge conflicts #20834: Pull request #5991 ready_for_review by Huffie56
March 23, 2024 07:22 2m 11s
March 23, 2024 07:22 2m 11s
Cleanup role selection for various game modes (#5976) Check for merge conflicts #20833: Commit e216bca pushed by github-merge-queue bot
March 22, 2024 19:45 4m 17s master
master
March 22, 2024 19:45 4m 17s
Tacmap makes no update noise for observers when hear/silence ghost an… Check for merge conflicts #20832: Commit fbd0d84 pushed by github-merge-queue bot
March 22, 2024 19:12 4m 16s master
master
March 22, 2024 19:12 4m 16s
Fortune Changes Check for merge conflicts #20831: Pull request #5994 opened by DN9123
March 22, 2024 18:43 11s
March 22, 2024 18:43 11s
Updated XM43E1 for Sniper Spec Check for merge conflicts #20830: Pull request #5774 synchronize by Kaga-404
March 22, 2024 04:58 9s
March 22, 2024 04:58 9s
Updated XM43E1 for Sniper Spec Check for merge conflicts #20829: Pull request #5774 ready_for_review by Kaga-404
March 22, 2024 04:57 10s
March 22, 2024 04:57 10s
Updated XM43E1 for Sniper Spec Check for merge conflicts #20828: Pull request #5774 synchronize by Kaga-404
March 22, 2024 04:57 10s
March 22, 2024 04:57 10s
[Do Not Merge] Adds Pylon Integration for Xeno EndGame double pyloning Check for merge conflicts #20827: Pull request #5993 opened by GrrrKitten
March 22, 2024 03:15 11s
March 22, 2024 03:15 11s
XM43E1 in regular gameplay Check for merge conflicts #20826: Pull request #5724 synchronize by Releasethesea
March 21, 2024 19:51 12s
March 21, 2024 19:51 12s
Fix,update CLF ERT Station. fix space tile and missing platform. Check for merge conflicts #20825: Pull request #5992 opened by Huffie56
March 21, 2024 15:53 14s
March 21, 2024 15:53 14s
[FIX,MAP] move semiotic in north evac pod so you can't see it when your behind in hull maintenance. Check for merge conflicts #20824: Pull request #5991 opened by Huffie56
March 21, 2024 15:47 11s
March 21, 2024 15:47 11s
Tacmap makes no update noise for observers when hear/silence ghost announcement is toggled on Check for merge conflicts #20823: Pull request #5990 synchronize by Vicacrov
March 21, 2024 15:00 13s
March 21, 2024 15:00 13s
Tacmap makes no update noise for observers when hear/silence ghost announcement is toggled on Check for merge conflicts #20822: Pull request #5990 opened by Vicacrov
March 21, 2024 10:26 12s
March 21, 2024 10:26 12s
Project ARES: Added Tech Unlock logs Check for merge conflicts #20821: Pull request #5006 ready_for_review by realforest2001
March 21, 2024 08:29 1m 34s
March 21, 2024 08:29 1m 34s
Project ARES: Added Tech Unlock logs Check for merge conflicts #20820: Pull request #5006 synchronize by realforest2001
March 21, 2024 08:29 11s
March 21, 2024 08:29 11s
(EVENT) Cortical Borers Check for merge conflicts #20819: Pull request #5829 synchronize by realforest2001
March 21, 2024 08:27 2m 12s
March 21, 2024 08:27 2m 12s