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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Xeno landmark changes Check for merge conflicts #16427: Pull request #4711 synchronize by BeagleGaming1
November 14, 2023 19:01 16s
November 14, 2023 19:01 16s
Fixes propaganda posters in CL office Check for merge conflicts #16426: Pull request #4930 opened by Birdtalon
November 14, 2023 17:55 11s
November 14, 2023 17:55 11s
Bigred Changes Part 2: Engineering And Reactor small touches Check for merge conflicts #16425: Pull request #4929 opened by spartanbobby
November 14, 2023 14:56 14s
November 14, 2023 14:56 14s
Ravager: replaces single letter vars Check for merge conflicts #16424: Pull request #4928 opened by Birdtalon
November 14, 2023 13:22 15s
November 14, 2023 13:22 15s
Hotfixes #4890 bug adds mising newline Check for merge conflicts #16423: Pull request #4919 ready_for_review by Birdtalon
November 14, 2023 08:30 14s
November 14, 2023 08:30 14s
Hotfixes #4890 bug adds mising newline Check for merge conflicts #16422: Pull request #4919 synchronize by Birdtalon
November 14, 2023 08:30 14s
November 14, 2023 08:30 14s
Runner: replace single letter vars (#4898) Check for merge conflicts #16421: Commit dcab36b pushed by github-merge-queue bot
November 14, 2023 06:04 4m 18s master
master
November 14, 2023 06:04 4m 18s
Moves sent faxes from highcom machines. Check for merge conflicts #16420: Pull request #4925 opened by realforest2001
November 14, 2023 04:35 45s
November 14, 2023 04:35 45s
Radio TGUI backend Tidy-up & Adds Listening Devices Check for merge conflicts #16419: Pull request #4866 synchronize by realforest2001
November 14, 2023 04:34 2m 16s
November 14, 2023 04:34 2m 16s
Lurker: bug fix, var disambiguation and redundant type checks Check for merge conflicts #16418: Pull request #4922 opened by Birdtalon
November 13, 2023 21:59 16s
November 13, 2023 21:59 16s
Warrior: replace single letter vars & remove redundant code Check for merge conflicts #16417: Pull request #4921 opened by Birdtalon
November 13, 2023 21:21 32s
November 13, 2023 21:21 32s
Biosuit Toe Fix Check for merge conflicts #16416: Pull request #4920 opened by sleepynecrons
November 13, 2023 21:19 16s
November 13, 2023 21:19 16s
Hotfixes #4890 bug adds mising newline Check for merge conflicts #16415: Pull request #4919 opened by Birdtalon
November 13, 2023 20:49 14s
November 13, 2023 20:49 14s
Refactors vendor global scope procs Check for merge conflicts #16414: Pull request #4918 opened by Birdtalon
November 13, 2023 18:25 11s
November 13, 2023 18:25 11s
added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. Check for merge conflicts #16413: Pull request #4586 synchronize by Huffie56
November 13, 2023 18:02 15s
November 13, 2023 18:02 15s
Sanitizes burrower tunnel names to alphanumeric only Check for merge conflicts #16412: Pull request #4911 synchronize by Birdtalon
November 13, 2023 17:57 12s
November 13, 2023 17:57 12s
Sanitizes burrower tunnel names to alphanumeric only Check for merge conflicts #16411: Pull request #4911 synchronize by Birdtalon
November 13, 2023 17:53 11s
November 13, 2023 17:53 11s
Sanitizes burrower tunnel names to alphanumeric only Check for merge conflicts #16410: Pull request #4911 ready_for_review by Birdtalon
November 13, 2023 17:50 12s
November 13, 2023 17:50 12s
Sanitizes burrower tunnel names to alphanumeric only Check for merge conflicts #16409: Pull request #4911 synchronize by Birdtalon
November 13, 2023 17:50 13s
November 13, 2023 17:50 13s
Early JSON logging implementation Check for merge conflicts #16408: Pull request #4917 opened by fira
November 13, 2023 17:37 13s
November 13, 2023 17:37 13s
Hotfixes accidental early update_canmove removal Check for merge conflicts #16407: Pull request #4915 opened by fira
November 13, 2023 15:20 14s
November 13, 2023 15:20 14s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16406: Pull request #4828 synchronize by fira
November 13, 2023 13:07 11s
November 13, 2023 13:07 11s
/tg/ Status Effects Part 2 - datum, KD, KO, Stuns Check for merge conflicts #16405: Pull request #4842 synchronize by fira
November 13, 2023 12:59 13s
November 13, 2023 12:59 13s
/tg/ Status Effects Part 2 - datum, KD, KO, Stuns Check for merge conflicts #16404: Pull request #4842 synchronize by fira
November 13, 2023 12:52 12s
November 13, 2023 12:52 12s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16403: Pull request #4828 synchronize by fira
November 13, 2023 12:49 14s
November 13, 2023 12:49 14s