Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,141 workflow run results
4,141 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Adds drawing to tacmaps Check for merge conflicts #15405: Pull request #4475 synchronize by ghost
October 13, 2023 23:46 11s
October 13, 2023 23:46 11s
Adds drawing to tacmaps Check for merge conflicts #15404: Pull request #4475 synchronize by ghost
October 13, 2023 23:04 23s
October 13, 2023 23:04 23s
Fixed default value in cash splitting being out of bounds for tgui_input_number Check for merge conflicts #15403: Pull request #4672 opened by fira
October 13, 2023 23:02 16s
October 13, 2023 23:02 16s
Adds drawing to tacmaps Check for merge conflicts #15402: Pull request #4475 synchronize by ghost
October 13, 2023 22:42 15s
October 13, 2023 22:42 15s
Adds drawing to tacmaps Check for merge conflicts #15401: Pull request #4475 synchronize by ghost
October 13, 2023 22:05 18s
October 13, 2023 22:05 18s
M39 arm brace stock disables when dropped (#4655) Check for merge conflicts #15400: Commit 1c62c62 pushed by github-merge-queue bot
October 13, 2023 21:10 7m 37s master
master
October 13, 2023 21:10 7m 37s
makes LZ detector work while landed round 2 Check for merge conflicts #15399: Pull request #4647 synchronize by cuberound
October 13, 2023 21:02 4m 33s
October 13, 2023 21:02 4m 33s
Adds drawing to tacmaps Check for merge conflicts #15398: Pull request #4475 synchronize by ghost
October 13, 2023 21:00 1m 2s
October 13, 2023 21:00 1m 2s
fixes upp medic/sapper survivor paygrade (#4646) Check for merge conflicts #15397: Commit 2a14790 pushed by github-merge-queue bot
October 13, 2023 20:44 8m 19s master
master
October 13, 2023 20:44 8m 19s
Vanguard Prae Pierce Refactor + Bugfix Check for merge conflicts #15396: Pull request #4641 synchronize by Birdtalon
October 13, 2023 20:26 17m 19s
October 13, 2023 20:26 17m 19s
Equipped squad presets start with full stomachs Check for merge conflicts #15395: Pull request #4671 opened by CapCamIII
October 13, 2023 20:21 3m 39s
October 13, 2023 20:21 3m 39s
Gives ERTs a variant of the regular medkit that isn't locked to skills in packs. Check for merge conflicts #15394: Pull request #4670 opened by CapCamIII
October 13, 2023 20:17 5m 5s
October 13, 2023 20:17 5m 5s
Adds safety check to bioprinter for resources and already printing Check for merge conflicts #15393: Pull request #4669 opened by Birdtalon
October 13, 2023 20:17 4m 8s
October 13, 2023 20:17 4m 8s
Solaris Ridge PMC Nightmare small changes (#4622) Check for merge conflicts #15392: Commit 20be6b2 pushed by github-merge-queue bot
October 13, 2023 20:15 4m 20s master
master
October 13, 2023 20:15 4m 20s
added faction weapon spawns for uscm upp clf and pmc (#4635) Check for merge conflicts #15391: Commit df98ce2 pushed by github-merge-queue bot
October 13, 2023 19:54 7m 17s master
master
October 13, 2023 19:54 7m 17s
fixes xenos seeing raw html on paper Check for merge conflicts #15390: Pull request #4654 synchronize by ghost
October 13, 2023 19:53 11s
October 13, 2023 19:53 11s
fixes xenos seeing raw html on paper Check for merge conflicts #15389: Pull request #4654 synchronize by ghost
October 13, 2023 19:53 13s
October 13, 2023 19:53 13s
Fixes disconnected ahelpers runtime Check for merge conflicts #15388: Pull request #4668 opened by fira
October 13, 2023 19:31 14s
October 13, 2023 19:31 14s
M39 arm brace stock disables when dropped Check for merge conflicts #15387: Pull request #4655 ready_for_review by BeagleGaming1
October 13, 2023 19:19 11s
October 13, 2023 19:19 11s
M39 arm brace stock disables when dropped Check for merge conflicts #15386: Pull request #4655 synchronize by BeagleGaming1
October 13, 2023 19:17 13s
October 13, 2023 19:17 13s
makes LZ detector work while landed round 2 Check for merge conflicts #15385: Pull request #4647 synchronize by cuberound
October 13, 2023 19:04 4m 21s
October 13, 2023 19:04 4m 21s
makes LZ detector work while landed round 2 Check for merge conflicts #15384: Pull request #4647 synchronize by cuberound
October 13, 2023 19:00 24s
October 13, 2023 19:00 24s
Fixes Disconnected Observers runtiming HUD Check for merge conflicts #15383: Pull request #4667 opened by fira
October 13, 2023 19:00 13s
October 13, 2023 19:00 13s
Adds a new satchel to the synth vendor Check for merge conflicts #15382: Pull request #4666 opened by Greg-Joffer
October 13, 2023 18:50 12s
October 13, 2023 18:50 12s
od linter Check for merge conflicts #15381: Pull request #4645 synchronize by harryob
October 13, 2023 18:42 14s
October 13, 2023 18:42 14s