Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
397 workflow run results
397 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Readds old MP uniform, armor and headgear. Adds MP lore descriptions. Tweaks MP locker loadouts. Check for merge conflicts #11476: Pull request #3758 opened by silencer-pl
June 28, 2023 17:23 11s
June 28, 2023 17:23 11s
New Varadero revamp Check for merge conflicts #11475: Pull request #3676 synchronize by AnuvKH
June 28, 2023 16:34 15s
June 28, 2023 16:34 15s
Fixes being unable to re-enter your body when you're unnested Check for merge conflicts #11474: Pull request #3747 ready_for_review by TheGamerdk
June 28, 2023 15:58 10s
June 28, 2023 15:58 10s
The weeds are hungry: Bodies for the weeds Check for merge conflicts #11473: Pull request #3644 synchronize by Drulikar
June 28, 2023 15:47 11s
June 28, 2023 15:47 11s
Yautja cloak changes Check for merge conflicts #11472: Pull request #3757 opened by realforest2001
June 28, 2023 15:40 2m 16s
June 28, 2023 15:40 2m 16s
Big Red Liaison Survivor (#3746) Check for merge conflicts #11471: Commit 6857776 pushed by github-merge-queue bot
June 28, 2023 15:32 3m 58s master
master
June 28, 2023 15:32 3m 58s
Yautja Gear Recovery Changes Check for merge conflicts #11470: Pull request #3455 synchronize by realforest2001
June 28, 2023 15:26 4m 35s
June 28, 2023 15:26 4m 35s
Yautja Gear Recovery Changes Check for merge conflicts #11469: Pull request #3455 ready_for_review by realforest2001
June 28, 2023 15:26 4m 47s
June 28, 2023 15:26 4m 47s
Yautja Gear Recovery Changes Check for merge conflicts #11468: Pull request #3455 synchronize by realforest2001
June 28, 2023 15:26 3m 34s
June 28, 2023 15:26 3m 34s
Yautja Bracer Charging Rework Check for merge conflicts #11467: Pull request #3456 synchronize by realforest2001
June 28, 2023 15:18 13s
June 28, 2023 15:18 13s
Bioscan Logging & Efficiency Upgrades Check for merge conflicts #11466: Pull request #3755 synchronize by realforest2001
June 28, 2023 14:59 12s
June 28, 2023 14:59 12s
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