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,782 workflow run results
3,782 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Ravager: replaces single letter vars (#4928) Check for merge conflicts #16487: Commit b04af9a pushed by github-merge-queue bot
November 16, 2023 21:42 4m 17s master
master
November 16, 2023 21:42 4m 17s
Adds Reflection to VV Modify Transform (#4907) Check for merge conflicts #16486: Commit 44f6a75 pushed by github-merge-queue bot
November 16, 2023 21:25 4m 21s master
master
November 16, 2023 21:25 4m 21s
Refactors vendor global scope procs Check for merge conflicts #16485: Pull request #4918 ready_for_review by Birdtalon
November 16, 2023 21:15 2m 49s
November 16, 2023 21:15 2m 49s
Refactors vendor global scope procs Check for merge conflicts #16484: Pull request #4918 synchronize by Birdtalon
November 16, 2023 21:15 2m 14s
November 16, 2023 21:15 2m 14s
Vehicles can be followed by ghosts (#4904) Check for merge conflicts #16483: Commit 5d8f695 pushed by github-merge-queue bot
November 16, 2023 21:11 4m 18s master
master
November 16, 2023 21:11 4m 18s
Biosuit Toe Fix (#4920) Check for merge conflicts #16482: Commit a83dcc9 pushed by github-merge-queue bot
November 16, 2023 20:34 4m 16s master
master
November 16, 2023 20:34 4m 16s
Lurker: bug fix, var disambiguation and redundant type checks (#4922) Check for merge conflicts #16481: Commit 75bdfdb pushed by github-merge-queue bot
November 16, 2023 20:20 4m 23s master
master
November 16, 2023 20:20 4m 23s
Moves sent faxes from highcom machines. (#4925) Check for merge conflicts #16480: Commit 35ce812 pushed by github-merge-queue bot
November 16, 2023 20:07 4m 16s master
master
November 16, 2023 20:07 4m 16s
QoL addition and adjustment to squad role vendors. Check for merge conflicts #16479: Pull request #4876 ready_for_review by Huffie56
November 16, 2023 19:47 14s
November 16, 2023 19:47 14s
added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. Check for merge conflicts #16478: Pull request #4586 ready_for_review by Huffie56
November 16, 2023 19:46 15s
November 16, 2023 19:46 15s
QoL addition and adjustment to squad role vendors. Check for merge conflicts #16477: Pull request #4876 synchronize by Huffie56
November 16, 2023 19:44 10s
November 16, 2023 19:44 10s
Fixes some Almayer Walls randomly changing icons when hit (#4936) Check for merge conflicts #16476: Commit 8d86085 pushed by github-merge-queue bot
November 16, 2023 19:39 4m 21s master
master
November 16, 2023 19:39 4m 21s
added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. Check for merge conflicts #16475: Pull request #4586 synchronize by Huffie56
November 16, 2023 19:29 36s
November 16, 2023 19:29 36s
Hotfixes #4890 bug adds mising newline (#4919) Check for merge conflicts #16474: Commit f288459 pushed by github-merge-queue bot
November 16, 2023 19:25 4m 16s master
master
November 16, 2023 19:25 4m 16s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16473: Pull request #4940 synchronize by harryob
November 16, 2023 18:56 10s
November 16, 2023 18:56 10s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16472: Pull request #4940 synchronize by harryob
November 16, 2023 18:32 11s
November 16, 2023 18:32 11s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16471: Pull request #4940 synchronize by harryob
November 16, 2023 18:20 13s
November 16, 2023 18:20 13s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16470: Pull request #4940 synchronize by harryob
November 16, 2023 18:18 15s
November 16, 2023 18:18 15s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16469: Pull request #4940 opened by harryob
November 16, 2023 18:14 13s
November 16, 2023 18:14 13s
Adds Latejoin scaling to Vendors and ASRS Check for merge conflicts #16468: Pull request #4939 ready_for_review by fira
November 16, 2023 18:07 11s
November 16, 2023 18:07 11s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16467: Pull request #4828 synchronize by fira
November 16, 2023 17:31 9s
November 16, 2023 17:31 9s
Fix missing delay on climbing objects Check for merge conflicts #16466: Pull request #4892 ready_for_review by fira
November 16, 2023 17:24 10s
November 16, 2023 17:24 10s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16465: Pull request #4828 synchronize by fira
November 16, 2023 17:02 1m 55s
November 16, 2023 17:02 1m 55s
LV-624 Cave Aesthetic Change (#4843) Check for merge conflicts #16464: Commit beb2196 pushed by github-merge-queue bot
November 16, 2023 16:58 4m 18s master
master
November 16, 2023 16:58 4m 18s
Adds Latejoin scaling to Vendors and ASRS Check for merge conflicts #16463: Pull request #4939 ready_for_review by fira
November 16, 2023 16:34 13m 36s
November 16, 2023 16:34 13m 36s