Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
343 workflow run results
343 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

EB Velocity Bugfix Check for merge conflicts #11497: Pull request #3762 opened by ghostsheet
June 29, 2023 08:09 16s
June 29, 2023 08:09 16s
Lurker no longer decloaks if they pounce onto a dead guy. (#3724) Check for merge conflicts #11496: Commit 5eba560 pushed by github-merge-queue bot
June 29, 2023 03:28 4m 18s master
master
June 29, 2023 03:28 4m 18s
Fixes wordiness about re-entering your body when you're unnested Check for merge conflicts #11495: Pull request #3761 opened by Drulikar
June 29, 2023 03:05 2m 12s
June 29, 2023 03:05 2m 12s
Fixes being unable to re-enter your body when you're unnested (#3747) Check for merge conflicts #11494: Commit 4b7aacd pushed by github-merge-queue bot
June 29, 2023 03:04 2m 21s master
master
June 29, 2023 03:04 2m 21s
Re-balances acid damage Check for merge conflicts #11493: Pull request #3749 ready_for_review by Diegoflores31
June 28, 2023 22:44 3m 21s
June 28, 2023 22:44 3m 21s
Re-balances acid damage Check for merge conflicts #11492: Pull request #3749 synchronize by Diegoflores31
June 28, 2023 22:43 1m 46s
June 28, 2023 22:43 1m 46s
Defender and Crusher tail smash has a 1% chance of doing a BONK! sound instead. Check for merge conflicts #11491: Pull request #3750 ready_for_review by Diegoflores31
June 28, 2023 22:38 2m 42s
June 28, 2023 22:38 2m 42s
Defender and Crusher tail smash has a 1% chance of doing a BONK! sound instead. Check for merge conflicts #11490: Pull request #3750 synchronize by Diegoflores31
June 28, 2023 22:38 2m 33s
June 28, 2023 22:38 2m 33s
People with lisp now lisp on radio Check for merge conflicts #11489: Pull request #3760 synchronize by Ben10083
June 28, 2023 22:28 12s
June 28, 2023 22:28 12s
People with lisp now lisp on radio Check for merge conflicts #11488: Pull request #3760 synchronize by Ben10083
June 28, 2023 22:25 11s
June 28, 2023 22:25 11s
People with lisp now lisp on radio Check for merge conflicts #11487: Pull request #3760 opened by Ben10083
June 28, 2023 22:25 14s
June 28, 2023 22:25 14s
Reduces the Burst timer from 10 minutes to 7.5 minutes (#3748) Check for merge conflicts #11486: Commit 217829c pushed by github-merge-queue bot
June 28, 2023 21:13 4m 16s master
master
June 28, 2023 21:13 4m 16s
remove more references to GAs Check for merge conflicts #11485: Pull request #3759 opened by harryob
June 28, 2023 20:55 11s
June 28, 2023 20:55 11s
removed the ability to plant c4 on zombies Check for merge conflicts #11484: Pull request #3637 synchronize by ghost
June 28, 2023 20:40 10s
June 28, 2023 20:40 10s
added camera shake to ob Check for merge conflicts #11483: Pull request #3658 ready_for_review by ghost
June 28, 2023 20:36 11s
June 28, 2023 20:36 11s
added camera shake to ob Check for merge conflicts #11482: Pull request #3658 synchronize by ghost
June 28, 2023 20:36 11s
June 28, 2023 20:36 11s
added camera shake to ob Check for merge conflicts #11481: Pull request #3658 synchronize by ghost
June 28, 2023 20:19 11s
June 28, 2023 20:19 11s
Bioscan Logging & Efficiency Upgrades Check for merge conflicts #11480: Pull request #3755 synchronize by realforest2001
June 28, 2023 18:04 15s
June 28, 2023 18:04 15s
Lurker no longer decloaks if they pounce onto a dead guy. Check for merge conflicts #11479: Pull request #3724 ready_for_review by TheGamerdk
June 28, 2023 17:49 51s
June 28, 2023 17:49 51s
Lurker no longer decloaks if they pounce onto a dead guy. Check for merge conflicts #11478: Pull request #3724 synchronize by TheGamerdk
June 28, 2023 17:48 42s
June 28, 2023 17:48 42s
Lurker no longer decloaks if they pounce onto a dead guy. Check for merge conflicts #11477: Pull request #3724 synchronize by TheGamerdk
June 28, 2023 17:48 11s
June 28, 2023 17:48 11s
Readds old MP uniform, armor and headgear. Adds MP lore descriptions. Tweaks MP locker loadouts. Check for merge conflicts #11476: Pull request #3758 opened by silencer-pl
June 28, 2023 17:23 11s
June 28, 2023 17:23 11s
New Varadero revamp Check for merge conflicts #11475: Pull request #3676 synchronize by AnuvKH
June 28, 2023 16:34 15s
June 28, 2023 16:34 15s
Fixes being unable to re-enter your body when you're unnested Check for merge conflicts #11474: Pull request #3747 ready_for_review by TheGamerdk
June 28, 2023 15:58 10s
June 28, 2023 15:58 10s
The weeds are hungry: Bodies for the weeds Check for merge conflicts #11473: Pull request #3644 synchronize by Drulikar
June 28, 2023 15:47 11s
June 28, 2023 15:47 11s