Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
8,929 workflow run results
8,929 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Project ARES: Nerve Gas Control Check for merge conflicts #20034: Pull request #5643 ready_for_review by realforest2001
February 25, 2024 14:43 9s
February 25, 2024 14:43 9s
Project ARES: Nerve Gas Control Check for merge conflicts #20033: Pull request #5643 synchronize by realforest2001
February 25, 2024 14:32 14s
February 25, 2024 14:32 14s
Fixes acid pillars shooting captured humans Check for merge conflicts #20032: Pull request #5807 opened by SabreML
February 25, 2024 14:23 10s
February 25, 2024 14:23 10s
Changes to south yard Sci-annex (#5792) Check for merge conflicts #20031: Commit df45b8a pushed by github-merge-queue bot
February 25, 2024 14:17 4m 13s master
master
February 25, 2024 14:17 4m 13s
Shiva's Panic Room Nightmare Insert Check for merge conflicts #20030: Pull request #5800 ready_for_review by BadAtThisGame302
February 25, 2024 10:49 13s
February 25, 2024 10:49 13s
Shiva's Panic Room Nightmare Insert Check for merge conflicts #20029: Pull request #5800 synchronize by BadAtThisGame302
February 25, 2024 10:44 11s
February 25, 2024 10:44 11s
M540-B Armored Recon Carrier Check for merge conflicts #20028: Pull request #5401 synchronize by Zonespace27
February 25, 2024 04:27 10s
February 25, 2024 04:27 10s
Closets now dense themselves based on pixel offset when being reclosed Check for merge conflicts #20027: Pull request #5780 synchronize by PhantomEpicness
February 25, 2024 02:57 11s
February 25, 2024 02:57 11s
G2 Electroshock Grenade "Sonic Electric Ball Breakers (SEBB)" [No Shitcode Edition] Check for merge conflicts #20026: Pull request #5697 synchronize by PhantomEpicness
February 25, 2024 02:39 12s
February 25, 2024 02:39 12s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20025: Pull request #5784 ready_for_review by GrrrKitten
February 25, 2024 02:33 11s
February 25, 2024 02:33 11s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20024: Pull request #5784 synchronize by GrrrKitten
February 25, 2024 02:32 12s
February 25, 2024 02:32 12s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20023: Pull request #5784 synchronize by GrrrKitten
February 25, 2024 02:28 12s
February 25, 2024 02:28 12s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20022: Pull request #5784 synchronize by GrrrKitten
February 25, 2024 02:11 11s
February 25, 2024 02:11 11s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20021: Pull request #5784 synchronize by GrrrKitten
February 25, 2024 02:11 11s
February 25, 2024 02:11 11s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20020: Pull request #5784 synchronize by GrrrKitten
February 25, 2024 01:48 12s
February 25, 2024 01:48 12s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20019: Pull request #5784 synchronize by GrrrKitten
February 25, 2024 01:12 13s
February 25, 2024 01:12 13s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20018: Pull request #5784 synchronize by GrrrKitten
February 25, 2024 01:11 2m 13s
February 25, 2024 01:11 2m 13s
Combat Correspondent Expansion Pt. 1 Check for merge conflicts #20017: Pull request #5784 synchronize by GrrrKitten
February 25, 2024 01:07 10s
February 25, 2024 01:07 10s
Brig Area Update/Refactor Check for merge conflicts #20016: Pull request #5723 synchronize by ItsVyzo
February 24, 2024 22:48 12s
February 24, 2024 22:48 12s
Another good Sprite PR Check for merge conflicts #20015: Pull request #5681 synchronize by BadAtThisGame302
February 24, 2024 21:47 10s
February 24, 2024 21:47 10s
Another good Sprite PR Check for merge conflicts #20014: Pull request #5681 synchronize by BadAtThisGame302
February 24, 2024 21:46 9s
February 24, 2024 21:46 9s
Another good Sprite PR Check for merge conflicts #20013: Pull request #5681 synchronize by BadAtThisGame302
February 24, 2024 21:42 10s
February 24, 2024 21:42 10s
Another good Sprite PR Check for merge conflicts #20012: Pull request #5681 synchronize by BadAtThisGame302
February 24, 2024 21:30 11s
February 24, 2024 21:30 11s
The Corpsening Check for merge conflicts #20011: Pull request #5805 opened by BadAtThisGame302
February 24, 2024 21:27 10s
February 24, 2024 21:27 10s
ports lazy templates, uses them for ert stations. distress beacons now start in transit to the ship, and return to their very own ert home Check for merge conflicts #20010: Pull request #5802 synchronize by harryob
February 24, 2024 21:18 10s
February 24, 2024 21:18 10s