Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
850 workflow run results
850 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes Breaching Hammer Mob Sprite (#4147) Check for merge conflicts #13439: Commit 3b62cdd pushed by github-merge-queue bot
August 11, 2023 08:11 4m 16s master
master
August 11, 2023 08:11 4m 16s
EVAC-3F & EVAC-3O Decoration Fighter Craft (USS Almayer & New Varadaro) Check for merge conflicts #13438: Pull request #4158 synchronize by Misttyy
August 11, 2023 08:05 2m 13s
August 11, 2023 08:05 2m 13s
Staff Officer Resprite - Boilersuits - Cap Resprites Check for merge conflicts #13437: Pull request #4159 synchronize by Misttyy
August 10, 2023 23:53 12s
August 10, 2023 23:53 12s
Helmet Visors/Optics and built-in HUDs Check for merge conflicts #13436: Pull request #4156 synchronize by morrowwolf
August 10, 2023 23:42 13s
August 10, 2023 23:42 13s
Staff Officer Resprite - Boilersuits - Cap Resprites Check for merge conflicts #13435: Pull request #4159 opened by Misttyy
August 10, 2023 23:33 15s
August 10, 2023 23:33 15s
Helmet Visors/Optics and built-in HUDs Check for merge conflicts #13434: Pull request #4156 synchronize by morrowwolf
August 10, 2023 22:57 26s
August 10, 2023 22:57 26s
Helmet Visors/Optics and built-in HUDs Check for merge conflicts #13433: Pull request #4156 synchronize by morrowwolf
August 10, 2023 22:55 1m 56s
August 10, 2023 22:55 1m 56s
Helmet Visors/Optics and built-in HUDs Check for merge conflicts #13432: Pull request #4156 synchronize by morrowwolf
August 10, 2023 22:53 14s
August 10, 2023 22:53 14s
EVAC-3F & EVAC-3O Decoration Fighter Craft (USS Almayer & New Varadaro) Check for merge conflicts #13431: Pull request #4158 ready_for_review by Misttyy
August 10, 2023 22:51 1m 9s
August 10, 2023 22:51 1m 9s
EVAC-3F & EVAC-3O Decoration Fighter Craft (USS Almayer & New Varadaro) Check for merge conflicts #13430: Pull request #4158 synchronize by Misttyy
August 10, 2023 22:50 15s
August 10, 2023 22:50 15s
Fixes a lot of guns having burst that shouldn't (#4113) Check for merge conflicts #13429: Commit b35889b pushed by github-merge-queue bot
August 10, 2023 22:48 4m 17s master
master
August 10, 2023 22:48 4m 17s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13428: Pull request #4151 synchronize by realforest2001
August 10, 2023 22:04 13s
August 10, 2023 22:04 13s
EVAC-3F & EVAC-3O Decoration Fighter Craft (USS Almayer & New Varadaro) Check for merge conflicts #13427: Pull request #4158 opened by Misttyy
August 10, 2023 21:54 14s
August 10, 2023 21:54 14s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13426: Pull request #4151 ready_for_review by blackdragonTOW
August 10, 2023 21:31 12s
August 10, 2023 21:31 12s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13425: Pull request #4151 synchronize by blackdragonTOW
August 10, 2023 21:12 22s
August 10, 2023 21:12 22s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13424: Pull request #4151 synchronize by blackdragonTOW
August 10, 2023 21:11 17s
August 10, 2023 21:11 17s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13423: Pull request #4151 synchronize by blackdragonTOW
August 10, 2023 21:10 12s
August 10, 2023 21:10 12s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13422: Pull request #4151 synchronize by blackdragonTOW
August 10, 2023 19:40 18s
August 10, 2023 19:40 18s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13421: Pull request #4151 synchronize by blackdragonTOW
August 10, 2023 19:39 13s
August 10, 2023 19:39 13s
fix prevent belt flare being filled by dump in action leaving no space for flare gun. Check for merge conflicts #13420: Pull request #4110 synchronize by Huffie56
August 10, 2023 18:50 12s
August 10, 2023 18:50 12s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13419: Pull request #4151 synchronize by blackdragonTOW
August 10, 2023 18:43 12s
August 10, 2023 18:43 12s
Yautja Change Holder Check for merge conflicts #13418: Pull request #4063 synchronize by realforest2001
August 10, 2023 18:31 13s
August 10, 2023 18:31 13s
Yautja Change Holder Check for merge conflicts #13417: Pull request #4063 synchronize by realforest2001
August 10, 2023 18:20 16s
August 10, 2023 18:20 16s
Yautja Weapon Gimmicks Check for merge conflicts #13416: Pull request #4047 synchronize by realforest2001
August 10, 2023 18:13 12s
August 10, 2023 18:13 12s
Helmet Visors/Optics and built-in HUDs Check for merge conflicts #13415: Pull request #4156 opened by morrowwolf
August 10, 2023 16:11 16s
August 10, 2023 16:11 16s