Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
360 workflow run results
360 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix Deterred Crashsite Offset (#3717) Check for merge conflicts #11440: Commit 8b7d442 pushed by github-merge-queue bot
June 28, 2023 06:17 4m 18s master
master
June 28, 2023 06:17 4m 18s
Removes 2second queen building cooldown when building away from hive … Check for merge conflicts #11439: Commit b710769 pushed by github-merge-queue bot
June 28, 2023 06:02 4m 15s master
master
June 28, 2023 06:02 4m 15s
Fix Infinite Recursion in Hugger Custom Rebound (#3730) Check for merge conflicts #11438: Commit 108751c pushed by github-merge-queue bot
June 28, 2023 05:44 2m 13s master
master
June 28, 2023 05:44 2m 13s
New facehugger strain: Watcher Check for merge conflicts #11437: Pull request #3726 ready_for_review by Hopekz
June 28, 2023 05:41 26s
June 28, 2023 05:41 26s
New facehugger strain: Watcher Check for merge conflicts #11436: Pull request #3726 synchronize by Hopekz
June 28, 2023 05:41 14s
June 28, 2023 05:41 14s
Almayer Maintenence Light Adjustments (#3731) Check for merge conflicts #11435: Commit 662abf1 pushed by github-merge-queue bot
June 28, 2023 05:29 4m 15s master
master
June 28, 2023 05:29 4m 15s
Big Red Liaison Survivor Check for merge conflicts #11434: Pull request #3746 synchronize by toolmind
June 28, 2023 02:30 15s
June 28, 2023 02:30 15s
Defender and Crusher tail smash has a 1% chance of doing a BONK! sound instead. Check for merge conflicts #11433: Pull request #3750 synchronize by Diegoflores31
June 28, 2023 02:26 2m 17s
June 28, 2023 02:26 2m 17s
Defender and Crusher tail smash has a 1% chance of doing a BONK! sound instead. Check for merge conflicts #11432: Pull request #3750 opened by Diegoflores31
June 28, 2023 00:22 1m 20s
June 28, 2023 00:22 1m 20s
added drawing functionality to tactical maps Check for merge conflicts #11431: Pull request #3363 synchronize by ghost
June 28, 2023 00:16 1m 38s
June 28, 2023 00:16 1m 38s
added drawing functionality to tactical maps Check for merge conflicts #11430: Pull request #3363 reopened by ghost
June 28, 2023 00:16 12s
June 28, 2023 00:16 12s
added camera shake to ob Check for merge conflicts #11429: Pull request #3658 ready_for_review by ghost
June 28, 2023 00:01 11s
June 28, 2023 00:01 11s
added camera shake to ob Check for merge conflicts #11428: Pull request #3658 synchronize by ghost
June 27, 2023 23:52 13s
June 27, 2023 23:52 13s
added camera shake to ob Check for merge conflicts #11427: Pull request #3658 synchronize by ghost
June 27, 2023 23:39 10s
June 27, 2023 23:39 10s
Re-balances acid damage Check for merge conflicts #11426: Pull request #3749 synchronize by Diegoflores31
June 27, 2023 23:30 14s
June 27, 2023 23:30 14s
Re-balances acid damage Check for merge conflicts #11425: Pull request #3749 synchronize by Diegoflores31
June 27, 2023 23:28 12s
June 27, 2023 23:28 12s
Re-balances acid damage Check for merge conflicts #11424: Pull request #3749 opened by Diegoflores31
June 27, 2023 23:24 1m 45s
June 27, 2023 23:24 1m 45s
added camera shake to ob Check for merge conflicts #11423: Pull request #3658 synchronize by ghost
June 27, 2023 23:22 16s
June 27, 2023 23:22 16s
Reduces the Burst timer from 10 minutes to 7.5 minutes Check for merge conflicts #11422: Pull request #3748 synchronize by Diegoflores31
June 27, 2023 22:37 11s
June 27, 2023 22:37 11s
Reduces the Burst timer from 10 minutes to 7.5 minutes Check for merge conflicts #11421: Pull request #3748 opened by Diegoflores31
June 27, 2023 22:01 12s
June 27, 2023 22:01 12s
Fixes being unable to re-enter your body when you're unnested Check for merge conflicts #11420: Pull request #3747 opened by TheGamerdk
June 27, 2023 21:06 5m 10s
June 27, 2023 21:06 5m 10s
Lurker no longer decloaks if they pounce onto a dead guy. Check for merge conflicts #11419: Pull request #3724 ready_for_review by TheGamerdk
June 27, 2023 21:05 15s
June 27, 2023 21:05 15s
Lurker no longer decloaks if they pounce onto a dead guy. Check for merge conflicts #11418: Pull request #3724 reopened by TheGamerdk
June 27, 2023 21:05 10s
June 27, 2023 21:05 10s
Lurker no longer decloaks if they pounce onto a dead guy. Check for merge conflicts #11417: Pull request #3724 synchronize by TheGamerdk
June 27, 2023 21:05 13s
June 27, 2023 21:05 13s
Big Red Liaison Survivor Check for merge conflicts #11416: Pull request #3746 opened by toolmind
June 27, 2023 20:24 13s
June 27, 2023 20:24 13s