Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
5,610 workflow run results
5,610 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

ASO Reqs Access Removal Check for merge conflicts #16854: Pull request #5038 opened by fira
November 25, 2023 23:40 12s
November 25, 2023 23:40 12s
Tutorial System: Retutorializing Check for merge conflicts #16853: Pull request #5030 synchronize by Zonespace27
November 25, 2023 23:13 18s
November 25, 2023 23:13 18s
Lesser drone CRASH hotfix Check for merge conflicts #16852: Pull request #5037 opened by Birdtalon
November 25, 2023 23:09 9s
November 25, 2023 23:09 9s
Tutorial System: Retutorializing Check for merge conflicts #16851: Pull request #5030 synchronize by Zonespace27
November 25, 2023 22:59 12s
November 25, 2023 22:59 12s
Fix post-SD detonation timer Check for merge conflicts #16850: Pull request #5036 opened by Zonespace27
November 25, 2023 22:39 9s
November 25, 2023 22:39 9s
Tutorial System: Retutorializing Check for merge conflicts #16849: Pull request #5030 synchronize by Zonespace27
November 25, 2023 22:13 11s
November 25, 2023 22:13 11s
Tutorial System: Retutorializing Check for merge conflicts #16848: Pull request #5030 synchronize by Zonespace27
November 25, 2023 22:13 10s
November 25, 2023 22:13 10s
Tutorial System: Retutorializing Check for merge conflicts #16847: Pull request #5030 synchronize by Zonespace27
November 25, 2023 22:12 2m 15s
November 25, 2023 22:12 2m 15s
Eggsac carrier revival Check for merge conflicts #16846: Pull request #4716 synchronize by Birdtalon
November 25, 2023 21:38 13s
November 25, 2023 21:38 13s
Whiskey Outpost can no longer roll pred rounds. Check for merge conflicts #16845: Pull request #5035 opened by realforest2001
November 25, 2023 21:19 12s
November 25, 2023 21:19 12s
More lifeboat launch options Check for merge conflicts #16844: Pull request #4976 synchronize by zzzmike
November 25, 2023 18:46 14s
November 25, 2023 18:46 14s
More lifeboat launch options Check for merge conflicts #16843: Pull request #4976 synchronize by zzzmike
November 25, 2023 18:46 10s
November 25, 2023 18:46 10s
Vehicle autofire Check for merge conflicts #16842: Pull request #4959 synchronize by Doubleumc
November 25, 2023 17:39 12s
November 25, 2023 17:39 12s
New Radial Menu for Xeno Evolve Check for merge conflicts #16841: Pull request #5022 synchronize by Birdtalon
November 25, 2023 17:21 10s
November 25, 2023 17:21 10s
New Radial Menu for Xeno Evolve Check for merge conflicts #16840: Pull request #5022 synchronize by Birdtalon
November 25, 2023 17:18 19s
November 25, 2023 17:18 19s
Refactors Xenomorph initialize Check for merge conflicts #16839: Pull request #4991 synchronize by Birdtalon
November 25, 2023 16:52 3m 54s
November 25, 2023 16:52 3m 54s
Adds Latejoin scaling to Vendors and ASRS Check for merge conflicts #16838: Pull request #4939 synchronize by fira
November 25, 2023 16:50 4m 27s
November 25, 2023 16:50 4m 27s
Dropship weapons console TGUI Check for merge conflicts #16837: Pull request #4812 synchronize by mullenpaul
November 25, 2023 16:49 12s
November 25, 2023 16:49 12s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16836: Pull request #4828 synchronize by fira
November 25, 2023 16:47 13s
November 25, 2023 16:47 13s
Moves Warrior Limb rip procs and adds check for host (#4979) Check for merge conflicts #16835: Commit 1f0f655 pushed by github-merge-queue bot
November 25, 2023 16:39 4m 14s master
master
November 25, 2023 16:39 4m 14s
Sorokyne Tunnels Upgrade Check for merge conflicts #16834: Pull request #5020 synchronize by HeresKozmos
November 25, 2023 16:33 14s
November 25, 2023 16:33 14s
check_grep.sh part ??: adds all global vars to the global controller … Check for merge conflicts #16833: Commit 1989719 pushed by github-merge-queue bot
November 25, 2023 16:23 2m 25s master
master
November 25, 2023 16:23 2m 25s
Character creation 'Preferred Armor' preview Check for merge conflicts #16832: Pull request #5033 synchronize by SabreML
November 25, 2023 15:17 11s
November 25, 2023 15:17 11s
Character creation 'Preferred Armor' preview Check for merge conflicts #16831: Pull request #5033 opened by SabreML
November 25, 2023 15:13 17s
November 25, 2023 15:13 17s
Cas sentryguns pricedown and dinamic one for omnisentryguns Check for merge conflicts #16830: Pull request #4909 ready_for_review by cuberound
November 25, 2023 15:04 13s
November 25, 2023 15:04 13s