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,105 workflow run results
2,105 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

ert tweaks Check for merge conflicts #14723: Pull request #4484 synchronize by CapCamIII
September 25, 2023 12:33 15s
September 25, 2023 12:33 15s
ert tweaks Check for merge conflicts #14722: Pull request #4484 synchronize by CapCamIII
September 25, 2023 11:49 14s
September 25, 2023 11:49 14s
Adds drawing to tacmaps Check for merge conflicts #14721: Pull request #4475 synchronize by ghost
September 25, 2023 11:14 15s
September 25, 2023 11:14 15s
Adds drawing to tacmaps Check for merge conflicts #14720: Pull request #4475 synchronize by ghost
September 25, 2023 11:04 13s
September 25, 2023 11:04 13s
Adds drawing to tacmaps Check for merge conflicts #14719: Pull request #4475 synchronize by ghost
September 25, 2023 11:02 12s
September 25, 2023 11:02 12s
Get Flat Icon Fixes Check for merge conflicts #14718: Pull request #4505 opened by Drulikar
September 25, 2023 10:56 16s
September 25, 2023 10:56 16s
Adds drawing to tacmaps Check for merge conflicts #14717: Pull request #4475 synchronize by ghost
September 25, 2023 10:27 12s
September 25, 2023 10:27 12s
"Do nothing" dual wield preference Check for merge conflicts #14716: Pull request #4504 opened by morrowwolf
September 25, 2023 09:57 15s
September 25, 2023 09:57 15s
Fixes akimbo bug Check for merge conflicts #14715: Pull request #4503 opened by morrowwolf
September 25, 2023 07:51 14s
September 25, 2023 07:51 14s
Disable join as xeno buried spawns when there is a queue Check for merge conflicts #14714: Pull request #4502 opened by Drulikar
September 25, 2023 05:48 15s
September 25, 2023 05:48 15s
Additional Working Joe Voicelines Check for merge conflicts #14713: Pull request #4501 synchronize by Ben10083
September 25, 2023 01:59 11s
September 25, 2023 01:59 11s
Additional Working Joe Voicelines Check for merge conflicts #14712: Pull request #4501 synchronize by Ben10083
September 25, 2023 01:57 29s
September 25, 2023 01:57 29s
Additional Working Joe Voicelines Check for merge conflicts #14711: Pull request #4501 synchronize by Ben10083
September 25, 2023 01:56 15s
September 25, 2023 01:56 15s
Additional Working Joe Voicelines Check for merge conflicts #14710: Pull request #4501 opened by Ben10083
September 25, 2023 01:48 13s
September 25, 2023 01:48 13s
Adds drawing to tacmaps Check for merge conflicts #14709: Pull request #4475 synchronize by ghost
September 25, 2023 01:25 12s
September 25, 2023 01:25 12s
Adds drawing to tacmaps Check for merge conflicts #14708: Pull request #4475 synchronize by ghost
September 25, 2023 01:18 2m 16s
September 25, 2023 01:18 2m 16s
Removes automatic hardcore from Whiskey Check for merge conflicts #14707: Pull request #4497 opened by CapCamIII
September 24, 2023 21:53 12s
September 24, 2023 21:53 12s
Adds drawing to tacmaps Check for merge conflicts #14706: Pull request #4475 synchronize by ghost
September 24, 2023 20:44 11s
September 24, 2023 20:44 11s
Adds drawing to tacmaps Check for merge conflicts #14705: Pull request #4475 synchronize by ghost
September 24, 2023 20:30 11s
September 24, 2023 20:30 11s
Adds drawing to tacmaps Check for merge conflicts #14704: Pull request #4475 synchronize by ghost
September 24, 2023 20:29 15s
September 24, 2023 20:29 15s
New CIC uniform Check for merge conflicts #14703: Pull request #4320 synchronize by CapCamIII
September 24, 2023 19:25 16s
September 24, 2023 19:25 16s
Bugfix: Unorderable Black Market Crate Check for merge conflicts #14702: Pull request #4495 opened by Crowbar764
September 24, 2023 15:03 18s
September 24, 2023 15:03 18s
Fixes grab delay after performing an action Check for merge conflicts #14701: Pull request #4494 opened by Git-Nivrak
September 24, 2023 14:30 13s
September 24, 2023 14:30 13s
Bugfix: Flashlights now correct their icon when disabled by a xeno slash. Check for merge conflicts #14700: Pull request #4493 opened by Crowbar764
September 24, 2023 13:20 13s
September 24, 2023 13:20 13s
Makes Dropship Pilot Two Dropship Crew Chief hours, instead of Five Marine squad hours. Check for merge conflicts #14699: Pull request #4488 ready_for_review by HumiliatedGoblin
September 24, 2023 13:04 12s
September 24, 2023 13:04 12s