Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
6,833 workflow run results
6,833 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Réorganisation des Pilotes et assistants Check for merge conflicts #19502: Pull request #5619 synchronize by LC4492
February 9, 2024 19:41 13s
February 9, 2024 19:41 13s
Weyland Yutani Trading Cards™ Check for merge conflicts #19501: Pull request #5665 synchronize by Warfan1815
February 9, 2024 19:03 11s
February 9, 2024 19:03 11s
fixes custom chemicals not working on the flamer nozzle Check for merge conflicts #19500: Pull request #5687 synchronize by iloveloopers
February 9, 2024 15:53 11s
February 9, 2024 15:53 11s
Update to some ultra ancient sprites Check for merge conflicts #19499: Pull request #5678 synchronize by Blundir
February 9, 2024 13:02 52s
February 9, 2024 13:02 52s
Fixes Warden Praetorians being able to move around the ovipositored Queen Check for merge conflicts #19498: Pull request #5689 opened by Vicacrov
February 9, 2024 12:30 14s
February 9, 2024 12:30 14s
Revive Lesser Drone and Facehugger temporary communication restrictions Check for merge conflicts #19497: Pull request #5688 opened by Drulikar
February 9, 2024 06:13 11s
February 9, 2024 06:13 11s
Food processor can be used to remove carpotoxin and acidic blood with master domestic skill Check for merge conflicts #19496: Pull request #5577 ready_for_review by LaylaMcC
February 9, 2024 04:00 9s
February 9, 2024 04:00 9s
fixes custom chemicals not working on the flamer nozzle Check for merge conflicts #19495: Pull request #5687 opened by iloveloopers
February 9, 2024 01:44 15s
February 9, 2024 01:44 15s
Reactor changes Check for merge conflicts #19494: Pull request #5657 synchronize by BeagleGaming1
February 9, 2024 01:07 2m 13s
February 9, 2024 01:07 2m 13s
Fix fruit counting and refactor out delete_fruit Check for merge conflicts #19493: Pull request #5686 opened by Drulikar
February 9, 2024 00:47 11s
February 9, 2024 00:47 11s
added squads marine ability to buy more sidearm magazines and moved/c… Check for merge conflicts #19492: Commit 9451050 pushed by github-merge-queue bot
February 9, 2024 00:26 4m 17s master
master
February 9, 2024 00:26 4m 17s
refactor : turning newscasters into "props" (#5522) Check for merge conflicts #19491: Commit 52b3076 pushed by github-merge-queue bot
February 9, 2024 00:08 4m 13s master
master
February 9, 2024 00:08 4m 13s
Another good Sprite PR Check for merge conflicts #19490: Pull request #5681 synchronize by BadAtThisGame302
February 8, 2024 21:35 16s
February 8, 2024 21:35 16s
Makes Research Civilians Again. Check for merge conflicts #19489: Pull request #5685 opened by BadAtThisGame302
February 8, 2024 21:08 12s
February 8, 2024 21:08 12s
Pizza ERT readded, fixes(?) UPP spawn chance Check for merge conflicts #19488: Pull request #5662 synchronize by private-tristan
February 8, 2024 19:18 12s
February 8, 2024 19:18 12s
Another good Sprite PR Check for merge conflicts #19487: Pull request #5681 synchronize by BadAtThisGame302
February 8, 2024 16:10 12s
February 8, 2024 16:10 12s
Another good Sprite PR Check for merge conflicts #19486: Pull request #5681 synchronize by BadAtThisGame302
February 8, 2024 15:45 15s
February 8, 2024 15:45 15s
Another good Sprite PR Check for merge conflicts #19485: Pull request #5681 synchronize by BadAtThisGame302
February 8, 2024 15:07 12s
February 8, 2024 15:07 12s
Increases RMCs/TWE's Rifles ROF Check for merge conflicts #19484: Pull request #5684 opened by Steelpoint
February 8, 2024 07:41 11s
February 8, 2024 07:41 11s
added tooltip to dropship for doors Check for merge conflicts #19483: Pull request #5683 opened by hislittlecuzingames
February 8, 2024 05:56 13s
February 8, 2024 05:56 13s
Update to some ultra ancient sprites Check for merge conflicts #19482: Pull request #5678 synchronize by Blundir
February 8, 2024 04:56 11s
February 8, 2024 04:56 11s
Réorganisation des Pilotes et assistants Check for merge conflicts #19481: Pull request #5619 synchronize by LC4492
February 8, 2024 03:43 13s
February 8, 2024 03:43 13s
Removes VAIMS backpack burn line, adds extra mag. Check for merge conflicts #19480: Pull request #5670 synchronize by private-tristan
February 8, 2024 03:37 15s
February 8, 2024 03:37 15s
WY Research Consultant gets reagent scanner goggles Check for merge conflicts #19479: Pull request #5682 opened by private-tristan
February 8, 2024 01:34 3m 29s
February 8, 2024 01:34 3m 29s
Update to some ultra ancient sprites Check for merge conflicts #19478: Pull request #5678 synchronize by Blundir
February 8, 2024 01:02 10s
February 8, 2024 01:02 10s