Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
3,744 workflow run results
3,744 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

New goggle sprite Check for merge conflicts #14989: Pull request #4557 opened by irRegularGuy646
September 30, 2023 22:07 15s
September 30, 2023 22:07 15s
Fixes incorrect floating objects/incorrect tiles/incorrect area/HEFA cult symbol on USS Almayer Check for merge conflicts #14988: Pull request #4556 synchronize by spartanbobby
September 30, 2023 20:24 10s
September 30, 2023 20:24 10s
Fixes incorrect floating objects/incorrect tiles/incorrect area/HEFA cult symbol on USS Almayer Check for merge conflicts #14987: Pull request #4556 opened by spartanbobby
September 30, 2023 20:16 14s
September 30, 2023 20:16 14s
Yautja Change Holder Check for merge conflicts #14986: Pull request #4063 synchronize by realforest2001
September 30, 2023 19:50 1m 19s
September 30, 2023 19:50 1m 19s
Yautja Weapon Gimmicks Check for merge conflicts #14985: Pull request #4047 synchronize by realforest2001
September 30, 2023 19:50 16s
September 30, 2023 19:50 16s
Rebalances Yautja bracer power Check for merge conflicts #14984: Pull request #4154 ready_for_review by realforest2001
September 30, 2023 19:49 14s
September 30, 2023 19:49 14s
Project ARES: Datacore Check for merge conflicts #14983: Pull request #4437 ready_for_review by realforest2001
September 30, 2023 19:45 15s
September 30, 2023 19:45 15s
Project ARES: Datacore Check for merge conflicts #14982: Pull request #4437 synchronize by realforest2001
September 30, 2023 19:45 10s
September 30, 2023 19:45 10s
Phone Do not Disturb Check for merge conflicts #14981: Pull request #4427 ready_for_review by realforest2001
September 30, 2023 19:33 12s
September 30, 2023 19:33 12s
Phone Do not Disturb Check for merge conflicts #14980: Pull request #4427 synchronize by realforest2001
September 30, 2023 19:33 14s
September 30, 2023 19:33 14s
Further Synth Cosmetic Additions + Roll Sleeves + Marine Beret Addit Check for merge conflicts #14979: Pull request #4553 synchronize by Steelpoint
September 30, 2023 16:30 14s
September 30, 2023 16:30 14s
Eggs No Longer Have Melee Resistance Check for merge conflicts #14978: Pull request #4555 synchronize by Steelpoint
September 30, 2023 16:26 15s
September 30, 2023 16:26 15s
Eggs No Longer Have Melee Resistance Check for merge conflicts #14977: Pull request #4555 opened by Steelpoint
September 30, 2023 16:17 12s
September 30, 2023 16:17 12s
Disease protection Check for merge conflicts #14976: Pull request #4524 ready_for_review by kiVts
September 30, 2023 15:09 12s
September 30, 2023 15:09 12s
Squad Briefings 2: The Briefening Check for merge conflicts #14975: Pull request #4539 synchronize by Warfan1815
September 30, 2023 12:00 15s
September 30, 2023 12:00 15s
Less Overpowered Commando ERTs (Marsoc, WY Whiteout, UPP Commandos) Check for merge conflicts #14974: Pull request #4466 ready_for_review by Steelpoint
September 30, 2023 08:50 4m 14s
September 30, 2023 08:50 4m 14s
Less Overpowered Commando ERTs (Marsoc, WY Whiteout, UPP Commandos) Check for merge conflicts #14973: Pull request #4466 synchronize by Steelpoint
September 30, 2023 08:49 14s
September 30, 2023 08:49 14s
Tool Pouch Allowed Items Change Check for merge conflicts #14972: Pull request #4554 opened by Steelpoint
September 30, 2023 08:44 12s
September 30, 2023 08:44 12s
Further Synth Cosmetic Additions + Roll Sleeves + Marine Beret Addit Check for merge conflicts #14971: Pull request #4553 synchronize by Steelpoint
September 30, 2023 08:40 15s
September 30, 2023 08:40 15s
Further Synth Cosmetic Additions + Roll Sleeves + Marine Beret Addit Check for merge conflicts #14970: Pull request #4553 opened by Steelpoint
September 30, 2023 08:38 12s
September 30, 2023 08:38 12s
Fixes fake incomplete surgery Check for merge conflicts #14969: Pull request #4552 opened by morrowwolf
September 30, 2023 05:27 12s
September 30, 2023 05:27 12s
Allows M46C to take rubber munitions (#4541) Check for merge conflicts #14968: Commit 242da56 pushed by github-merge-queue bot
September 30, 2023 02:32 4m 13s master
master
September 30, 2023 02:32 4m 13s
Colonial Marshals in Distress! CMB Handheld Distress Beacon Check for merge conflicts #14967: Pull request #4540 synchronize by QuickLode
September 30, 2023 02:25 16s
September 30, 2023 02:25 16s
Xeno structure cheese reduction Check for merge conflicts #14966: Pull request #4550 opened by morrowwolf
September 30, 2023 02:16 2m 14s
September 30, 2023 02:16 2m 14s
Disable join as xeno buried spawns when there is a queue (#4502) Check for merge conflicts #14965: Commit 1bd5639 pushed by github-merge-queue bot
September 30, 2023 00:26 4m 17s master
master
September 30, 2023 00:26 4m 17s