Skip to content

Actions: cmss13-devs/cmss13-pve

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
609 workflow run results
609 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

derelict almayer dorms Check for merge conflicts #384: Commit c79aa8d pushed by morrowwolf
November 6, 2023 13:34 2m 12s master
master
November 6, 2023 13:34 2m 12s
Merge remote-tracking branch 'CMSS13/master' Check for merge conflicts #383: Commit 394ad4f pushed by morrowwolf
November 6, 2023 13:25 2m 13s master
master
November 6, 2023 13:25 2m 13s
Xenos can now always access hivemind Check for merge conflicts #382: Pull request #53 synchronize by private-tristan
November 6, 2023 03:41 12s
November 6, 2023 03:41 12s
Xenos can now always access hivemind Check for merge conflicts #381: Pull request #53 opened by private-tristan
November 6, 2023 03:20 13s
November 6, 2023 03:20 13s
Removes xeno tips, a few other things Check for merge conflicts #380: Pull request #52 opened by private-tristan
November 6, 2023 02:46 13s
November 6, 2023 02:46 13s
Brand-new crooshie AI Check for merge conflicts #379: Pull request #51 synchronize by xDanilcusx
November 6, 2023 01:03 14s
November 6, 2023 01:03 14s
firareview Check for merge conflicts #378: Commit 32b5ab5 pushed by morrowwolf
November 6, 2023 00:25 3m 27s master
master
November 6, 2023 00:25 3m 27s
Brand-new crooshie AI Check for merge conflicts #377: Pull request #51 opened by xDanilcusx
November 6, 2023 00:24 16s
November 6, 2023 00:24 16s
New beacon sound! Check for merge conflicts #376: Pull request #50 opened by xDanilcusx
November 5, 2023 22:03 14s
November 5, 2023 22:03 14s
Adds pilot, crew chief, synth to low pop Check for merge conflicts #375: Pull request #49 synchronize by WolfOrion
November 5, 2023 21:47 11s
November 5, 2023 21:47 11s
Adds pilot, crew chief, synth to low pop Check for merge conflicts #374: Pull request #49 opened by WolfOrion
November 5, 2023 21:47 16s
November 5, 2023 21:47 16s
Deployable beacons! Check for merge conflicts #373: Commit a248407 pushed by morrowwolf
November 5, 2023 19:40 2m 16s master
master
November 5, 2023 19:40 2m 16s
Delayed Narration Check for merge conflicts #372: Commit ec8b577 pushed by morrowwolf
November 5, 2023 18:19 2m 11s master
master
November 5, 2023 18:19 2m 11s
No slots text Check for merge conflicts #371: Commit 186dbe9 pushed by morrowwolf
November 5, 2023 17:42 2m 13s master
master
November 5, 2023 17:42 2m 13s
object narrate is now atom narrate Check for merge conflicts #370: Commit 63a9fbc pushed by morrowwolf
November 5, 2023 17:23 2m 9s master
master
November 5, 2023 17:23 2m 9s
tweaks VV jump to Check for merge conflicts #369: Commit 57d8942 pushed by morrowwolf
November 5, 2023 17:10 2m 13s master
master
November 5, 2023 17:10 2m 13s
Vent shake, explicit panels Check for merge conflicts #368: Commit e2f1b40 pushed by morrowwolf
November 5, 2023 17:06 2m 15s master
master
November 5, 2023 17:06 2m 15s
Probably cursed but multi game master vent support Check for merge conflicts #367: Commit e37380f pushed by morrowwolf
November 5, 2023 16:52 2m 9s master
master
November 5, 2023 16:52 2m 9s
Directional Lock no longer slows you (#45) Check for merge conflicts #366: Commit 3b503b7 pushed by morrowwolf
November 5, 2023 16:29 3m 48s master
master
November 5, 2023 16:29 3m 48s
Fixes supply console icon Check for merge conflicts #365: Commit 9974572 pushed by morrowwolf
November 5, 2023 16:29 2m 16s master
master
November 5, 2023 16:29 2m 16s
epinephrine renamed to adrenaline, changes the desc of it (#46) Check for merge conflicts #364: Commit aa3f7bc pushed by morrowwolf
November 5, 2023 16:24 2m 11s master
master
November 5, 2023 16:24 2m 11s
Replaces Falling Falcons unit patches with Solar Devils unit patches.… Check for merge conflicts #363: Commit 8f69711 pushed by morrowwolf
November 5, 2023 16:20 2m 11s master
master
November 5, 2023 16:20 2m 11s
Replaces Falling Falcons unit patches with Solar Devils unit patches. Check for merge conflicts #362: Pull request #48 synchronize by blackdragonTOW
November 5, 2023 11:18 10s
November 5, 2023 11:18 10s
Replaces Falling Falcons unit patches with Solar Devils unit patches. Check for merge conflicts #361: Pull request #48 ready_for_review by blackdragonTOW
November 5, 2023 09:23 15s
November 5, 2023 09:23 15s
Replaces Falling Falcons unit patches with Solar Devils unit patches. Check for merge conflicts #360: Pull request #48 synchronize by blackdragonTOW
November 5, 2023 09:22 11s
November 5, 2023 09:22 11s
ProTip! You can narrow down the results and go further in time using created:<2023-11-05 or the other filters available.