Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
3,641 workflow run results
3,641 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix job entry message wiki links (#4823) Check for merge conflicts #16144: Commit 3ea4e87 pushed by github-merge-queue bot
November 6, 2023 03:44 4m 19s master
master
November 6, 2023 03:44 4m 19s
Better OB cannon logging (#4830) Check for merge conflicts #16143: Commit 08d427d pushed by github-merge-queue bot
November 6, 2023 03:30 4m 15s master
master
November 6, 2023 03:30 4m 15s
Fixes being able to load a flamer tank with no flamer unit (#4825) Check for merge conflicts #16142: Commit 7ea7e72 pushed by github-merge-queue bot
November 6, 2023 03:12 2m 14s master
master
November 6, 2023 03:12 2m 14s
Reimplements halloween pumpkin helmets event Check for merge conflicts #16141: Pull request #4623 synchronize by harryob
November 6, 2023 03:10 14s
November 6, 2023 03:10 14s
Fixes GC deletion issues around reagents (#4833) Check for merge conflicts #16140: Commit 0a64aac pushed by github-merge-queue bot
November 6, 2023 03:02 2m 12s master
master
November 6, 2023 03:02 2m 12s
Adding toners to rec vendors (#4834) Check for merge conflicts #16139: Commit f4ad05c pushed by github-merge-queue bot
November 6, 2023 02:44 2m 13s master
master
November 6, 2023 02:44 2m 13s
[NI] - Kutjevo Communications | Re-Addition of Kutjevo Blackbox Check for merge conflicts #16138: Pull request #4572 reopened by harryob
November 6, 2023 02:40 14s
November 6, 2023 02:40 14s
Pill packets fit in helmets now (#4841) Check for merge conflicts #16137: Commit bbaf0bf pushed by github-merge-queue bot
November 6, 2023 02:16 4m 20s master
master
November 6, 2023 02:16 4m 20s
Pill packets fit in helmets now Check for merge conflicts #16136: Pull request #4841 synchronize by Releasethesea
November 6, 2023 01:34 13s
November 6, 2023 01:34 13s
Automatic TGS DMAPI Update Check for merge conflicts #16135: Pull request #4850 opened by cm13-github
November 6, 2023 00:50 11s
November 6, 2023 00:50 11s
Minor fixes for Loadout Items Check for merge conflicts #16134: Pull request #4849 opened by fira
November 5, 2023 23:20 11s
November 5, 2023 23:20 11s
fixes typo Check for merge conflicts #16133: Pull request #4848 opened by zzzmike
November 5, 2023 22:52 10s
November 5, 2023 22:52 10s
Thermal Alternate PR Check for merge conflicts #16132: Pull request #4780 ready_for_review by Zonespace27
November 5, 2023 20:58 10s
November 5, 2023 20:58 10s
Dropship weapons console TGUI Check for merge conflicts #16131: Pull request #4812 synchronize by mullenpaul
November 5, 2023 20:50 1m 9s
November 5, 2023 20:50 1m 9s
Keycard authenticator can call ERT winout admin intervention Check for merge conflicts #16130: Pull request #4477 synchronize by Diegoflores31
November 5, 2023 20:50 12s
November 5, 2023 20:50 12s
Dropship weapons console TGUI Check for merge conflicts #16129: Pull request #4812 synchronize by mullenpaul
November 5, 2023 20:37 15s
November 5, 2023 20:37 15s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16128: Pull request #4828 synchronize by fira
November 5, 2023 20:16 11s
November 5, 2023 20:16 11s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16127: Pull request #4828 synchronize by fira
November 5, 2023 17:47 11s
November 5, 2023 17:47 11s
new whistle Check for merge conflicts #16126: Pull request #4847 opened by 567Turtle
November 5, 2023 17:09 9s
November 5, 2023 17:09 9s
/tg/ Status effects part 1 - fluid status updates Check for merge conflicts #16125: Pull request #4828 synchronize by fira
November 5, 2023 17:04 13s
November 5, 2023 17:04 13s
Adding toners to rec vendors Check for merge conflicts #16124: Pull request #4834 synchronize by fordmichigan
November 5, 2023 16:37 13s
November 5, 2023 16:37 13s
Ares Final Scan takes 1 minute instead of 3 Check for merge conflicts #16123: Pull request #4846 opened by private-tristan
November 5, 2023 16:18 16s
November 5, 2023 16:18 16s
Dropship weapons console TGUI Check for merge conflicts #16122: Pull request #4812 synchronize by mullenpaul
November 5, 2023 15:33 13s
November 5, 2023 15:33 13s
Hotfixes being able to put anything in your boots Check for merge conflicts #16121: Pull request #4845 ready_for_review by fira
November 5, 2023 15:08 3m 25s
November 5, 2023 15:08 3m 25s
Hotfixes being able to put anything in your boots Check for merge conflicts #16120: Pull request #4845 opened by fira
November 5, 2023 15:08 48s
November 5, 2023 15:08 48s