Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,294 workflow run results
2,294 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix you will no longer be able to feed without any limit with the fork. Check for merge conflicts #13489: Pull request #4174 opened by Huffie56
August 12, 2023 20:23 59s
August 12, 2023 20:23 59s
fix and small balance change to the utility vendor. Check for merge conflicts #13488: Pull request #4169 ready_for_review by Huffie56
August 12, 2023 20:21 11s
August 12, 2023 20:21 11s
Fix bug plant keep growing Check for merge conflicts #13487: Pull request #4173 synchronize by MikeKuwait
August 12, 2023 20:18 12s
August 12, 2023 20:18 12s
Fix bug plant keep growing Check for merge conflicts #13486: Pull request #4173 opened by MikeKuwait
August 12, 2023 20:17 12s
August 12, 2023 20:17 12s
Foxtrot cryomarines spawn as freed mobs if not taken Check for merge conflicts #13485: Pull request #4132 synchronize by ihatethisengine
August 12, 2023 18:57 28s
August 12, 2023 18:57 28s
Foxtrot cryomarines spawn as freed mobs if not taken Check for merge conflicts #13484: Pull request #4132 synchronize by ihatethisengine
August 12, 2023 18:56 11s
August 12, 2023 18:56 11s
Rounds oxyloss from bloodloss Check for merge conflicts #13483: Pull request #4172 opened by morrowwolf
August 12, 2023 17:18 14s
August 12, 2023 17:18 14s
More random slashes take two Check for merge conflicts #13482: Pull request #4171 opened by morrowwolf
August 12, 2023 16:42 13s
August 12, 2023 16:42 13s
Removes no-armor sentinel slow-spit insta-knockdown Check for merge conflicts #13481: Pull request #4170 opened by CapCamIII
August 12, 2023 16:34 12s
August 12, 2023 16:34 12s
Helmet Visors/Optics and built-in HUDs Check for merge conflicts #13480: Pull request #4156 synchronize by morrowwolf
August 12, 2023 14:56 14s
August 12, 2023 14:56 14s
Helmet Visors/Optics and built-in HUDs Check for merge conflicts #13479: Pull request #4156 synchronize by morrowwolf
August 12, 2023 13:51 12s
August 12, 2023 13:51 12s
fix and small balance change to the utility vendor. Check for merge conflicts #13478: Pull request #4169 synchronize by Huffie56
August 12, 2023 08:57 11s
August 12, 2023 08:57 11s
fix and small balance change to the utility vendor. Check for merge conflicts #13477: Pull request #4169 opened by Huffie56
August 12, 2023 08:36 12s
August 12, 2023 08:36 12s
Royal Marines Commando Check for merge conflicts #13476: Pull request #4098 synchronize by spartanbobby
August 12, 2023 06:14 14s
August 12, 2023 06:14 14s
fixes out of bound areas in play are of LV522 Check for merge conflicts #13475: Pull request #4168 opened by spartanbobby
August 12, 2023 06:07 14s
August 12, 2023 06:07 14s
fix typo mistake from matchs to matches. (#4073) Check for merge conflicts #13474: Commit 6a4c62e pushed by github-merge-queue bot
August 12, 2023 02:42 4m 14s master
master
August 12, 2023 02:42 4m 14s
Changes to Organ-Stabilizing property Check for merge conflicts #13473: Pull request #4117 synchronize by BeagleGaming1
August 12, 2023 02:06 15s
August 12, 2023 02:06 15s
Changes to Organ-Stabilizing property Check for merge conflicts #13472: Pull request #4117 synchronize by BeagleGaming1
August 12, 2023 01:30 2m 16s
August 12, 2023 01:30 2m 16s
Changes to EZ Autoinjectors Check for merge conflicts #13471: Pull request #4167 ready_for_review by BeagleGaming1
August 11, 2023 23:08 33s
August 11, 2023 23:08 33s
Changes to EZ Autoinjectors Check for merge conflicts #13470: Pull request #4167 synchronize by BeagleGaming1
August 11, 2023 23:06 13s
August 11, 2023 23:06 13s
Changes to EZ Autoinjectors Check for merge conflicts #13469: Pull request #4167 opened by BeagleGaming1
August 11, 2023 22:57 11s
August 11, 2023 22:57 11s
Smurfing Queens Check for merge conflicts #13468: Pull request #4166 opened by morrowwolf
August 11, 2023 21:36 11s
August 11, 2023 21:36 11s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13467: Pull request #4151 synchronize by blackdragonTOW
August 11, 2023 17:52 27s
August 11, 2023 17:52 27s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13466: Pull request #4151 synchronize by blackdragonTOW
August 11, 2023 17:51 14s
August 11, 2023 17:51 14s
Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #13465: Pull request #4003 synchronize by Zonespace27
August 11, 2023 17:22 12s
August 11, 2023 17:22 12s