Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,553 workflow run results
2,553 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Reimplements halloween pumpkin helmets event Check for merge conflicts #15264: Pull request #4623 ready_for_review by fira
October 10, 2023 23:13 2m 36s
October 10, 2023 23:13 2m 36s
M39 being able to use vertical grip again [BUFF] Check for merge conflicts #15263: Pull request #4627 synchronize by irakligabunia
October 10, 2023 23:13 1m 3s
October 10, 2023 23:13 1m 3s
Reimplements halloween pumpkin helmets event Check for merge conflicts #15262: Pull request #4623 synchronize by fira
October 10, 2023 23:12 17s
October 10, 2023 23:12 17s
M39 being able to use vertical grip again [BUFF] Check for merge conflicts #15261: Pull request #4627 opened by irakligabunia
October 10, 2023 21:52 13s
October 10, 2023 21:52 13s
Removes clan menu honor count (#4620) Check for merge conflicts #15260: Commit 2f572d4 pushed by github-merge-queue bot
October 10, 2023 21:40 4m 19s master
master
October 10, 2023 21:40 4m 19s
Adds the ability to pick up paper bins and stops fires consuming more… Check for merge conflicts #15259: Commit 58389ce pushed by github-merge-queue bot
October 10, 2023 21:26 4m 15s master
master
October 10, 2023 21:26 4m 15s
Small changes to light floors (#4599) Check for merge conflicts #15258: Commit d50d658 pushed by github-merge-queue bot
October 10, 2023 21:11 4m 16s master
master
October 10, 2023 21:11 4m 16s
Small changes to light floors Check for merge conflicts #15257: Pull request #4599 ready_for_review by harryob
October 10, 2023 21:03 15s
October 10, 2023 21:03 15s
Adds CBRN ERT Check for merge conflicts #15256: Pull request #4337 synchronize by BeagleGaming1
October 10, 2023 20:15 21s
October 10, 2023 20:15 21s
Adds drawing to tacmaps Check for merge conflicts #15255: Pull request #4475 synchronize by ghost
October 10, 2023 18:51 14s
October 10, 2023 18:51 14s
Squad Briefings 2: The Briefening Check for merge conflicts #15254: Pull request #4539 synchronize by Warfan1815
October 10, 2023 18:23 14s
October 10, 2023 18:23 14s
Survivors Spawn In Same Area Check for merge conflicts #15253: Pull request #4624 opened by Steelpoint
October 10, 2023 18:00 16s
October 10, 2023 18:00 16s
Adds MP, OT and CL Tents Check for merge conflicts #15252: Pull request #4596 synchronize by Steelpoint
October 10, 2023 17:58 17s
October 10, 2023 17:58 17s
Reimplements halloween pumpkin helmets event Check for merge conflicts #15251: Pull request #4623 synchronize by fira
October 10, 2023 15:51 13s
October 10, 2023 15:51 13s
Squad Briefings 2: The Briefening Check for merge conflicts #15250: Pull request #4539 synchronize by Warfan1815
October 10, 2023 15:35 13s
October 10, 2023 15:35 13s
Squad Briefings 2: The Briefening Check for merge conflicts #15249: Pull request #4539 synchronize by Warfan1815
October 10, 2023 15:35 16s
October 10, 2023 15:35 16s
Reimplements halloween pumpkin helmets event Check for merge conflicts #15248: Pull request #4623 synchronize by fira
October 10, 2023 14:54 15s
October 10, 2023 14:54 15s
Small changes to light floors Check for merge conflicts #15247: Pull request #4599 synchronize by BeagleGaming1
October 10, 2023 12:40 15s
October 10, 2023 12:40 15s
Reimplements halloween pumpkin helmets event Check for merge conflicts #15246: Pull request #4623 opened by fira
October 10, 2023 12:01 18s
October 10, 2023 12:01 18s
Solaris Ridge PMC Nightmare small changes Check for merge conflicts #15245: Pull request #4622 synchronize by QuickLode
October 10, 2023 06:12 14s
October 10, 2023 06:12 14s
Solaris Ridge PMC Nightmare small changes Check for merge conflicts #15244: Pull request #4622 opened by QuickLode
October 10, 2023 05:32 12s
October 10, 2023 05:32 12s
Fixes previous goggle pr helmet sprites (#4613) Check for merge conflicts #15243: Commit 0c23c26 pushed by github-merge-queue bot
October 10, 2023 05:26 4m 15s master
master
October 10, 2023 05:26 4m 15s
Colonial Marshals in Distress! CMB Handheld Distress Beacon Check for merge conflicts #15242: Pull request #4540 ready_for_review by QuickLode
October 10, 2023 04:21 12s
October 10, 2023 04:21 12s
Colonial Marshals in Distress! CMB Handheld Distress Beacon Check for merge conflicts #15241: Pull request #4540 synchronize by QuickLode
October 10, 2023 04:11 14s
October 10, 2023 04:11 14s
Adds drawing to tacmaps Check for merge conflicts #15240: Pull request #4475 synchronize by ghost
October 10, 2023 02:26 15s
October 10, 2023 02:26 15s