Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
753 workflow run results
753 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

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
Yautja Change Holder Check for merge conflicts #13414: Pull request #4063 synchronize by realforest2001
August 10, 2023 15:39 5m 22s
August 10, 2023 15:39 5m 22s
Yautja Change Holder Check for merge conflicts #13413: Pull request #4063 synchronize by realforest2001
August 10, 2023 15:39 13s
August 10, 2023 15:39 13s
Yautja Weapon Gimmicks Check for merge conflicts #13412: Pull request #4047 synchronize by realforest2001
August 10, 2023 15:39 14s
August 10, 2023 15:39 14s
Yautja Weapon Gimmicks Check for merge conflicts #13411: Pull request #4047 synchronize by realforest2001
August 10, 2023 15:34 12s
August 10, 2023 15:34 12s
OOC prefix proc Check for merge conflicts #13410: Pull request #2536 synchronize by realforest2001
August 10, 2023 15:00 2m 18s
August 10, 2023 15:00 2m 18s
Yautja Vision Changes Check for merge conflicts #13409: Pull request #4046 synchronize by realforest2001
August 10, 2023 14:58 12s
August 10, 2023 14:58 12s
Rebalances Yautja bracer power Check for merge conflicts #13408: Pull request #4154 opened by realforest2001
August 10, 2023 14:53 14s
August 10, 2023 14:53 14s
Yautja Change Holder Check for merge conflicts #13407: Pull request #4063 synchronize by realforest2001
August 10, 2023 14:49 16s
August 10, 2023 14:49 16s
Yautja Legacy restoration & Yautja Sprite Fixes Check for merge conflicts #13406: Pull request #4033 synchronize by realforest2001
August 10, 2023 14:20 1m 27s
August 10, 2023 14:20 1m 27s
Yautja Vision Changes Check for merge conflicts #13405: Pull request #4046 synchronize by realforest2001
August 10, 2023 14:20 13s
August 10, 2023 14:20 13s
Yautja Vision Changes Check for merge conflicts #13404: Pull request #4046 synchronize by realforest2001
August 10, 2023 14:16 16s
August 10, 2023 14:16 16s
OOC prefix proc Check for merge conflicts #13403: Pull request #2536 ready_for_review by realforest2001
August 10, 2023 14:08 14s
August 10, 2023 14:08 14s
Item Strip changes Check for merge conflicts #13402: Pull request #4153 ready_for_review by morrowwolf
August 10, 2023 14:01 11s
August 10, 2023 14:01 11s
Item Strip changes Check for merge conflicts #13401: Pull request #4153 synchronize by realforest2001
August 10, 2023 13:50 14s
August 10, 2023 13:50 14s
fix prevent belt flare being filled by dump in action leaving no space for flare gun. Check for merge conflicts #13400: Pull request #4110 ready_for_review by Huffie56
August 10, 2023 13:38 13s
August 10, 2023 13:38 13s
Item Strip changes Check for merge conflicts #13399: Pull request #4153 opened by realforest2001
August 10, 2023 13:34 11s
August 10, 2023 13:34 11s
fix prevent belt flare being filled by dump in action leaving no space for flare gun. Check for merge conflicts #13398: Pull request #4110 synchronize by Huffie56
August 10, 2023 13:25 36s
August 10, 2023 13:25 36s
ICC patch Check for merge conflicts #13397: Pull request #4152 opened by TopHatPenguin
August 10, 2023 12:52 14s
August 10, 2023 12:52 14s