Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
360 workflow run results
360 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bioscan Logging & Efficiency Upgrades Check for merge conflicts #11465: Pull request #3755 synchronize by realforest2001
June 28, 2023 14:54 11s
June 28, 2023 14:54 11s
Remove dead code for langchat rotations Check for merge conflicts #11464: Pull request #3756 opened by Drulikar
June 28, 2023 14:46 12s
June 28, 2023 14:46 12s
Project ARES - Resurrection (#3298) Check for merge conflicts #11463: Commit 9dd2c0d pushed by github-merge-queue bot
June 28, 2023 14:43 4m 15s master
master
June 28, 2023 14:43 4m 15s
Removes unintended extra storage G8 from jackets (#3743) Check for merge conflicts #11462: Commit da8bda7 pushed by github-merge-queue bot
June 28, 2023 14:10 2m 56s master
master
June 28, 2023 14:10 2m 56s
The weeds are hungry: Bodies for the weeds Check for merge conflicts #11461: Pull request #3644 synchronize by Drulikar
June 28, 2023 14:07 1m 26s
June 28, 2023 14:07 1m 26s
Impaler Burrower strain (with fixes) Check for merge conflicts #11460: Pull request #3565 synchronize by Unknownity
June 28, 2023 13:47 14s
June 28, 2023 13:47 14s
Port /tg/ PR #75835 - Linux 515 fcopy() crash fix Check for merge conflicts #11459: Pull request #3525 reopened by harryob
June 28, 2023 13:31 10s
June 28, 2023 13:31 10s
Impaler Burrower strain (with fixes) Check for merge conflicts #11458: Pull request #3565 synchronize by Unknownity
June 28, 2023 13:25 13s
June 28, 2023 13:25 13s
Bioscan Logging & Efficiency Upgrades Check for merge conflicts #11457: Pull request #3755 synchronize by realforest2001
June 28, 2023 13:04 2m 17s
June 28, 2023 13:04 2m 17s
Bioscan Logging & Efficiency Upgrades Check for merge conflicts #11456: Pull request #3755 synchronize by realforest2001
June 28, 2023 13:03 1m 5s
June 28, 2023 13:03 1m 5s
Bioscan Logging & Efficiency Upgrades Check for merge conflicts #11455: Pull request #3755 opened by realforest2001
June 28, 2023 12:56 3m 49s
June 28, 2023 12:56 3m 49s
Project ARES - Resurrection Check for merge conflicts #11454: Pull request #3298 synchronize by realforest2001
June 28, 2023 12:55 13s
June 28, 2023 12:55 13s
Project ARES - Resurrection Check for merge conflicts #11453: Pull request #3298 synchronize by realforest2001
June 28, 2023 12:36 15s
June 28, 2023 12:36 15s
Synth armour sprite change Check for merge conflicts #11452: Pull request #3728 synchronize by Steelpoint
June 28, 2023 11:42 10s
June 28, 2023 11:42 10s
Defender and Crusher tail smash has a 1% chance of doing a BONK! sound instead. Check for merge conflicts #11451: Pull request #3750 reopened by Diegoflores31
June 28, 2023 11:31 1m 30s
June 28, 2023 11:31 1m 30s
Synth armour sprite change Check for merge conflicts #11450: Pull request #3728 synchronize by Steelpoint
June 28, 2023 11:30 11s
June 28, 2023 11:30 11s
LV522: Moves breaching charge again, buffs sec armoury as optional lo… Check for merge conflicts #11449: Commit 151f92e pushed by github-merge-queue bot
June 28, 2023 10:31 4m 16s master
master
June 28, 2023 10:31 4m 16s
Port TG#74500: Adds VERB_REF and derivative Check for merge conflicts #11448: Pull request #3753 opened by Drulikar
June 28, 2023 10:10 15s
June 28, 2023 10:10 15s
Fix minimap removeimage proc not checking z level correctly Check for merge conflicts #11447: Pull request #3752 opened by Drulikar
June 28, 2023 08:38 2m 16s
June 28, 2023 08:38 2m 16s
Xenos no longer can pull dead xenos (#3666) Check for merge conflicts #11446: Commit 613e967 pushed by github-merge-queue bot
June 28, 2023 08:00 2m 26s master
master
June 28, 2023 08:00 2m 26s
added drawing functionality to tactical maps Check for merge conflicts #11445: Pull request #3363 synchronize by ghost
June 28, 2023 07:54 1m 7s
June 28, 2023 07:54 1m 7s
Fixes communications intel objective being instantly completed (#3723) Check for merge conflicts #11444: Commit 5d1c11e pushed by github-merge-queue bot
June 28, 2023 07:28 4m 18s master
master
June 28, 2023 07:28 4m 18s
Removes toxin mags on shivas (#3736) Check for merge conflicts #11443: Commit 10fcbde pushed by github-merge-queue bot
June 28, 2023 06:56 4m 18s master
master
June 28, 2023 06:56 4m 18s
Removes wrong warden locker Check for merge conflicts #11442: Pull request #3751 opened by morrowwolf
June 28, 2023 06:39 1m 8s
June 28, 2023 06:39 1m 8s
Xenos no longer can pull dead xenos Check for merge conflicts #11441: Pull request #3666 synchronize by morrowwolf
June 28, 2023 06:35 13s
June 28, 2023 06:35 13s