Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
7,305 workflow run results
7,305 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

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
(Slightly) Less confusing failure message for built-in visors Check for merge conflicts #20009: Pull request #5804 opened by SabreML
February 24, 2024 21:02 2m 11s
February 24, 2024 21:02 2m 11s
Small auto-observe fixes (#5788) Check for merge conflicts #20008: Commit bab9f86 pushed by github-merge-queue bot
February 24, 2024 21:00 2m 14s master
master
February 24, 2024 21:00 2m 14s
speeds up ci runs by 3 minutes Check for merge conflicts #20007: Pull request #5803 opened by harryob
February 24, 2024 20:50 3m 44s
February 24, 2024 20:50 3m 44s
Barricades Multi-Weld Revert & Refactoring (#5795) Check for merge conflicts #20006: Commit 4546ee0 pushed by github-merge-queue bot
February 24, 2024 20:42 2m 12s master
master
February 24, 2024 20:42 2m 12s
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 #20005: Pull request #5802 synchronize by harryob
February 24, 2024 20:34 2m 21s
February 24, 2024 20:34 2m 21s
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 #20004: Pull request #5802 opened by harryob
February 24, 2024 20:32 3m 10s
February 24, 2024 20:32 3m 10s
Refactor marine_armor.dm and split it into multiples files. (#5740) Check for merge conflicts #20003: Commit 747b74d pushed by github-merge-queue bot
February 24, 2024 20:29 4m 25s master
master
February 24, 2024 20:29 4m 25s
Reenables Prison station Check for merge conflicts #20002: Pull request #5801 opened by Greg-Joffer
February 24, 2024 19:54 9s
February 24, 2024 19:54 9s
Shiva's Panic Room Nightmare Insert Check for merge conflicts #20001: Pull request #5800 opened by BadAtThisGame302
February 24, 2024 14:36 12s
February 24, 2024 14:36 12s
Nightmare Insert Fixes & Elevated Nightmare Errors Check for merge conflicts #20000: Pull request #5796 synchronize by Drulikar
February 24, 2024 12:30 12s
February 24, 2024 12:30 12s
Relay Ping Browser (#5777) Check for merge conflicts #19999: Commit c24ffb7 pushed by github-merge-queue bot
February 24, 2024 10:10 4m 12s master
master
February 24, 2024 10:10 4m 12s
Refactor marine_armor.dm and split it into multiples files. Check for merge conflicts #19998: Pull request #5740 ready_for_review by Huffie56
February 24, 2024 09:41 10s
February 24, 2024 09:41 10s
Map: Bigred change south lambda padlock and turned it into a checkpoint. Check for merge conflicts #19997: Pull request #5763 ready_for_review by Huffie56
February 24, 2024 08:38 11s
February 24, 2024 08:38 11s
Refactor marine_armor.dm and split it into multiples files. Check for merge conflicts #19996: Pull request #5740 synchronize by Huffie56
February 24, 2024 08:35 9s
February 24, 2024 08:35 9s
Map: Bigred change south lambda padlock and turned it into a checkpoint. Check for merge conflicts #19995: Pull request #5763 synchronize by Huffie56
February 24, 2024 08:26 13s
February 24, 2024 08:26 13s
Changes to LV522 southwest dorms (#5790) Check for merge conflicts #19994: Commit f9233b8 pushed by github-merge-queue bot
February 24, 2024 06:23 4m 17s master
master
February 24, 2024 06:23 4m 17s
Details LV624 secure storage blast area (#5794) Check for merge conflicts #19993: Commit 4555fc2 pushed by github-merge-queue bot
February 24, 2024 06:00 4m 21s master
master
February 24, 2024 06:00 4m 21s
Opens up 1x1 hellscape on kutjevo, removes ledges in combat zone (#5793) Check for merge conflicts #19992: Commit a5fbc7c pushed by github-merge-queue bot
February 24, 2024 05:43 4m 13s master
master
February 24, 2024 05:43 4m 13s