Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
3,805 workflow run results
3,805 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes combistick folding (#4526) Check for merge conflicts #14900: Commit d964f00 pushed by github-merge-queue bot
September 28, 2023 08:59 4m 23s master
master
September 28, 2023 08:59 4m 23s
Fixes yautja relay beacon not uncloaking correctly (#4527) Check for merge conflicts #14899: Commit 8f423c5 pushed by github-merge-queue bot
September 28, 2023 08:45 4m 19s master
master
September 28, 2023 08:45 4m 19s
Fixes yautja bracers getting stuck in-hand (#4528) Check for merge conflicts #14898: Commit 0c25c79 pushed by github-merge-queue bot
September 28, 2023 08:30 4m 17s master
master
September 28, 2023 08:30 4m 17s
Yautja can no longer mark xenoes as honorable (#4529) Check for merge conflicts #14897: Commit e1c1fc4 pushed by github-merge-queue bot
September 28, 2023 08:11 4m 19s master
master
September 28, 2023 08:11 4m 19s
Fixes taking control of crit xenos Check for merge conflicts #14896: Pull request #4536 opened by morrowwolf
September 28, 2023 08:01 2m 17s
September 28, 2023 08:01 2m 17s
Minor Item Additions To Synth Vendor (#4515) Check for merge conflicts #14895: Commit ed97c67 pushed by github-merge-queue bot
September 28, 2023 07:56 4m 19s master
master
September 28, 2023 07:56 4m 19s
Bugfix: Camera sprites (#4512) Check for merge conflicts #14894: Commit f6a8c3f pushed by github-merge-queue bot
September 28, 2023 07:42 4m 18s master
master
September 28, 2023 07:42 4m 18s
no more anchorpoint pvt (#4492) Check for merge conflicts #14893: Commit 0f25138 pushed by github-merge-queue bot
September 28, 2023 07:27 4m 15s master
master
September 28, 2023 07:27 4m 15s
External webbing can hold firearms (#4482) Check for merge conflicts #14892: Commit 9484615 pushed by github-merge-queue bot
September 28, 2023 07:13 4m 17s master
master
September 28, 2023 07:13 4m 17s
Adds drawing to tacmaps Check for merge conflicts #14891: Pull request #4475 synchronize by ghost
September 28, 2023 05:49 14s
September 28, 2023 05:49 14s
Floodlight rework Check for merge conflicts #14890: Pull request #4535 opened by morrowwolf
September 28, 2023 05:39 15s
September 28, 2023 05:39 15s
Minor Item Additions To Synth Vendor Check for merge conflicts #14889: Pull request #4515 synchronize by Steelpoint
September 28, 2023 05:36 21s
September 28, 2023 05:36 21s
Minor Item Additions To Synth Vendor Check for merge conflicts #14888: Pull request #4515 synchronize by Steelpoint
September 28, 2023 05:35 11s
September 28, 2023 05:35 11s
Adds drawing to tacmaps Check for merge conflicts #14887: Pull request #4475 synchronize by ghost
September 28, 2023 04:14 13s
September 28, 2023 04:14 13s
"Fixes" missing window frame icon states Check for merge conflicts #14886: Pull request #4534 synchronize by morrowwolf
September 28, 2023 03:50 15s
September 28, 2023 03:50 15s
Minor Item Additions To Synth Vendor Check for merge conflicts #14885: Pull request #4515 ready_for_review by Steelpoint
September 28, 2023 03:50 15s
September 28, 2023 03:50 15s
Minor Item Additions To Synth Vendor Check for merge conflicts #14884: Pull request #4515 synchronize by Steelpoint
September 28, 2023 03:50 13s
September 28, 2023 03:50 13s
Hijack objectives Check for merge conflicts #14883: Pull request #4391 synchronize by morrowwolf
September 28, 2023 03:15 1m 21s
September 28, 2023 03:15 1m 21s
"Fixes" missing window frame icon states Check for merge conflicts #14882: Pull request #4534 opened by morrowwolf
September 28, 2023 03:13 1m 23s
September 28, 2023 03:13 1m 23s
Adds drawing to tacmaps Check for merge conflicts #14881: Pull request #4475 synchronize by ghost
September 28, 2023 03:12 14s
September 28, 2023 03:12 14s
Adds drawing to tacmaps Check for merge conflicts #14880: Pull request #4475 synchronize by ghost
September 28, 2023 03:04 12s
September 28, 2023 03:04 12s
USS Almayer, CL & CC Hypersleep bay, fixes symmetry issue in CIC hall… Check for merge conflicts #14879: Commit b5fa7dd pushed by github-merge-queue bot
September 28, 2023 02:37 4m 28s master
master
September 28, 2023 02:37 4m 28s
Adds drawing to tacmaps Check for merge conflicts #14878: Pull request #4475 synchronize by ghost
September 28, 2023 02:31 35s
September 28, 2023 02:31 35s
USS Almayer, CL & CC Hypersleep bay, fixes symmetry issue in CIC hallway (that I broke), adds some warning stripes around for detailing, re-gigs the PO bunk area to get rid of horrible 1x3 hallway Check for merge conflicts #14877: Pull request #4510 synchronize by morrowwolf
September 28, 2023 02:14 2m 24s
September 28, 2023 02:14 2m 24s
Tutorial System Check for merge conflicts #14876: Pull request #4442 synchronize by Zonespace27
September 28, 2023 02:11 27s
September 28, 2023 02:11 27s