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,217 workflow run results
3,217 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #15951: Pull request #4251 synchronize by LC4492
October 29, 2023 21:04 10s
October 29, 2023 21:04 10s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #15950: Pull request #4251 synchronize by LC4492
October 29, 2023 20:43 26s
October 29, 2023 20:43 26s
Zone de commandement général - 2 - Mapping CIC Rework / Part 2 Check for merge conflicts #15949: Pull request #4251 synchronize by LC4492
October 29, 2023 20:41 15s
October 29, 2023 20:41 15s
Tentative Fix/Consistency for Dummy Limb Runtimes Check for merge conflicts #15948: Pull request #4805 opened by fira
October 29, 2023 17:41 16s
October 29, 2023 17:41 16s
Fix runtimes in toxic water targeting unliving Check for merge conflicts #15947: Pull request #4804 opened by fira
October 29, 2023 16:45 12s
October 29, 2023 16:45 12s
Tent code changes Check for merge conflicts #15946: Pull request #4796 ready_for_review by BeagleGaming1
October 29, 2023 16:34 14s
October 29, 2023 16:34 14s
Tent code changes Check for merge conflicts #15945: Pull request #4796 synchronize by BeagleGaming1
October 29, 2023 16:31 12s
October 29, 2023 16:31 12s
Whiskey Outpost Reqs Tweaks Check for merge conflicts #15944: Pull request #4803 synchronize by fira
October 29, 2023 14:39 13s
October 29, 2023 14:39 13s
Whiskey Outpost Reqs Tweaks Check for merge conflicts #15943: Pull request #4803 opened by fira
October 29, 2023 11:12 10s
October 29, 2023 11:12 10s
M4 Synthetic PMC 'armor' changes Check for merge conflicts #15942: Pull request #4758 synchronize by QuickLode
October 29, 2023 11:00 14s
October 29, 2023 11:00 14s
extends invis wall Check for merge conflicts #15941: Pull request #4802 opened by harryob
October 29, 2023 05:53 12s
October 29, 2023 05:53 12s
Tent code changes Check for merge conflicts #15940: Pull request #4796 synchronize by BeagleGaming1
October 29, 2023 01:57 13s
October 29, 2023 01:57 13s
Adds new loadout items Check for merge conflicts #15939: Pull request #4801 ready_for_review by BeagleGaming1
October 29, 2023 01:40 11s
October 29, 2023 01:40 11s
Adds new loadout items Check for merge conflicts #15938: Pull request #4801 synchronize by BeagleGaming1
October 29, 2023 01:32 14s
October 29, 2023 01:32 14s
Adds new loadout items Check for merge conflicts #15937: Pull request #4801 opened by BeagleGaming1
October 29, 2023 01:21 2m 19s
October 29, 2023 01:21 2m 19s
Fixes to donator backpack icon Check for merge conflicts #15936: Pull request #4800 opened by SASoperative
October 29, 2023 00:34 13s
October 29, 2023 00:34 13s
Predators are no longer immune to molecular acid Check for merge conflicts #15935: Pull request #4799 opened by private-tristan
October 28, 2023 17:45 15s
October 28, 2023 17:45 15s
Remove Direct Hit Limb Penalty against Xenos (#4788) Check for merge conflicts #15934: Commit b2dfbb3 pushed by github-merge-queue bot
October 28, 2023 12:12 4m 18s master
master
October 28, 2023 12:12 4m 18s
Fix for incendiary OB spread. (#4791) Check for merge conflicts #15933: Commit 1b5575e pushed by github-merge-queue bot
October 28, 2023 11:56 4m 18s master
master
October 28, 2023 11:56 4m 18s
Provost sprites and code cleanup (#4409) Check for merge conflicts #15932: Commit 04fa22d pushed by github-merge-queue bot
October 28, 2023 11:41 4m 20s master
master
October 28, 2023 11:41 4m 20s
makes LZ detector work while landed round 2 Check for merge conflicts #15931: Pull request #4647 synchronize by cuberound
October 28, 2023 10:09 14s
October 28, 2023 10:09 14s
Co vendor touch ups Check for merge conflicts #15930: Pull request #4798 opened by 4hands44
October 28, 2023 09:58 12s
October 28, 2023 09:58 12s
Tent code changes Check for merge conflicts #15929: Pull request #4796 synchronize by BeagleGaming1
October 28, 2023 03:16 13s
October 28, 2023 03:16 13s
fix for donator backpack not showing Check for merge conflicts #15928: Pull request #4797 opened by SASoperative
October 28, 2023 02:52 11s
October 28, 2023 02:52 11s
Tent code changes Check for merge conflicts #15927: Pull request #4796 opened by BeagleGaming1
October 28, 2023 02:47 17s
October 28, 2023 02:47 17s