Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
13,774 workflow run results
13,774 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Corporate Dome Nightmare Insert Expansion Check for merge conflicts #31157: Pull request #7893 synchronize by BOBAMAx
December 26, 2024 10:32 14s
December 26, 2024 10:32 14s
Corporate Dome Nightmare Insert Expansion Check for merge conflicts #31156: Pull request #7893 synchronize by BOBAMAx
December 26, 2024 10:20 10s
December 26, 2024 10:20 10s
Reboot Reason Ignore (#7910) Check for merge conflicts #31155: Commit 8c6ef07 pushed by github-merge-queue bot
December 26, 2024 10:16 4m 11s master
master
December 26, 2024 10:16 4m 11s
516 compat Check for merge conflicts #31154: Pull request #7860 synchronize by hry-gh
December 26, 2024 09:34 11s
December 26, 2024 09:34 11s
Project Sugarwater: Comprehensive HM Tutorials Check for merge conflicts #31153: Pull request #7555 synchronize by SpypigDev
December 26, 2024 06:54 10s
December 26, 2024 06:54 10s
TWE Royal Marine Corps Re-Armed Check for merge conflicts #31152: Pull request #7787 synchronize by KaiserBlackwood
December 26, 2024 04:12 12s
December 26, 2024 04:12 12s
Project Sugarwater: Comprehensive HM Tutorials Check for merge conflicts #31151: Pull request #7555 synchronize by SpypigDev
December 26, 2024 03:44 11s
December 26, 2024 03:44 11s
Project Sugarwater: Comprehensive HM Tutorials Check for merge conflicts #31150: Pull request #7555 synchronize by SpypigDev
December 26, 2024 03:32 11s
December 26, 2024 03:32 11s
fix clf distress beacon typos Check for merge conflicts #31149: Pull request #7916 opened by lanse12
December 25, 2024 22:35 10s
December 25, 2024 22:35 10s
TWE Royal Marine Corps Re-Armed Check for merge conflicts #31148: Pull request #7787 synchronize by KaiserBlackwood
December 25, 2024 19:30 8s
December 25, 2024 19:30 8s
TWE Royal Marine Corps Re-Armed Check for merge conflicts #31147: Pull request #7787 synchronize by KaiserBlackwood
December 25, 2024 19:24 14s
December 25, 2024 19:24 14s
TWE Royal Marine Corps Re-Armed Check for merge conflicts #31146: Pull request #7787 synchronize by KaiserBlackwood
December 25, 2024 19:24 11s
December 25, 2024 19:24 11s
Expanding and fixing prefrence items Check for merge conflicts #31145: Pull request #7915 synchronize by TheManWithNoHands
December 25, 2024 13:56 11s
December 25, 2024 13:56 11s
Expanding and fixing prefrence items Check for merge conflicts #31144: Pull request #7915 opened by TheManWithNoHands
December 25, 2024 13:43 13s
December 25, 2024 13:43 13s
MRE Big Content Update: Cornbread Edition Check for merge conflicts #31143: Pull request #7895 synchronize by Blundir
December 25, 2024 11:43 9s
December 25, 2024 11:43 9s
MRE Big Content Update: Cornbread Edition Check for merge conflicts #31142: Pull request #7895 synchronize by Blundir
December 25, 2024 11:40 2m 8s
December 25, 2024 11:40 2m 8s
MRE Big Content Update: Cornbread Edition Check for merge conflicts #31141: Pull request #7895 synchronize by Blundir
December 25, 2024 11:39 28s
December 25, 2024 11:39 28s
MRE Big Content Update: Cornbread Edition Check for merge conflicts #31140: Pull request #7895 synchronize by Blundir
December 25, 2024 11:39 12s
December 25, 2024 11:39 12s
MRE Big Content Update: Cornbread Edition Check for merge conflicts #31139: Pull request #7895 synchronize by Blundir
December 25, 2024 11:36 3m 4s
December 25, 2024 11:36 3m 4s
Fixed missing telephone inhand sprites Check for merge conflicts #31138: Pull request #7914 opened by Blundir
December 25, 2024 11:33 12s
December 25, 2024 11:33 12s
Fixes santa hat inhands + makes it hide only top hair Check for merge conflicts #31137: Pull request #7913 opened by Blundir
December 25, 2024 11:32 14s
December 25, 2024 11:32 14s
Fix of starting overload on reactor message Check for merge conflicts #31136: Pull request #7912 opened by blackcrystall
December 25, 2024 04:52 1m 10s
December 25, 2024 04:52 1m 10s
improvement for cryo squad marines cryoning and some minor QOL for radnomiz_squad proc Check for merge conflicts #31135: Pull request #7911 opened by blackcrystall
December 25, 2024 04:34 2m 5s
December 25, 2024 04:34 2m 5s
Fixes maintainer access to the profiler and clears profiler access whenever admins are loaded. Check for merge conflicts #31134: Pull request #7909 synchronize by Watermelon914
December 25, 2024 03:58 9s
December 25, 2024 03:58 9s
Reboot Reason Ignore Check for merge conflicts #31133: Pull request #7910 opened by Drulikar
December 25, 2024 03:12 11s
December 25, 2024 03:12 11s