Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,087 workflow run results
4,087 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

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
Synthetic internal powercell Check for merge conflicts #15239: Pull request #4559 ready_for_review by QuickLode
October 10, 2023 02:10 2m 14s
October 10, 2023 02:10 2m 14s
Synthetic internal powercell Check for merge conflicts #15238: Pull request #4559 synchronize by QuickLode
October 10, 2023 00:45 14s
October 10, 2023 00:45 14s
Synthetic internal powercell Check for merge conflicts #15237: Pull request #4559 synchronize by QuickLode
October 10, 2023 00:43 14s
October 10, 2023 00:43 14s
M4 Synthetic Armor Sprite edit Check for merge conflicts #15236: Pull request #4614 synchronize by QuickLode
October 10, 2023 00:30 16s
October 10, 2023 00:30 16s
Project ARES: Hijack logging (#4471) Check for merge conflicts #15235: Commit cfafcd9 pushed by github-merge-queue bot
October 10, 2023 00:24 4m 22s master
master
October 10, 2023 00:24 4m 22s
Adds drawing to tacmaps Check for merge conflicts #15234: Pull request #4475 ready_for_review by ghost
October 10, 2023 00:01 14m 45s
October 10, 2023 00:01 14m 45s
Adds drawing to tacmaps Check for merge conflicts #15233: Pull request #4475 synchronize by ghost
October 10, 2023 00:01 14m 45s
October 10, 2023 00:01 14m 45s
Adds drawing to tacmaps Check for merge conflicts #15232: Pull request #4475 synchronize by ghost
October 9, 2023 23:56 3m 16s
October 9, 2023 23:56 3m 16s
marine helmets no longer spawn with squad optics. Check for merge conflicts #15231: Pull request #4618 synchronize by private-tristan
October 9, 2023 23:56 2m 32s
October 9, 2023 23:56 2m 32s
Slightly optimizes client performance (#4610) Check for merge conflicts #15230: Commit e03c820 pushed by github-merge-queue bot
October 9, 2023 23:52 6m 9s master
master
October 9, 2023 23:52 6m 9s
Medbelts pull from pillbottles as default Check for merge conflicts #15229: Pull request #4621 opened by IsProbablyCatto
October 9, 2023 23:49 1m 11s
October 9, 2023 23:49 1m 11s
Removes clan menu honor count Check for merge conflicts #15228: Pull request #4620 opened by Zonespace27
October 9, 2023 23:47 14s
October 9, 2023 23:47 14s
makes the description for origins do something Check for merge conflicts #15227: Pull request #4619 opened by harryob
October 9, 2023 23:31 39s
October 9, 2023 23:31 39s