Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
195 workflow run results
195 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

New UPP guns Check for merge conflicts #12742: Pull request #3865 synchronize by CapCamIII
July 26, 2023 18:02 1m 12s
July 26, 2023 18:02 1m 12s
fixes xeno wound icon delay Check for merge conflicts #12741: Pull request #4011 opened by realkhad
July 26, 2023 18:00 1m 23s
July 26, 2023 18:00 1m 23s
New UPP guns Check for merge conflicts #12740: Pull request #3865 synchronize by CapCamIII
July 26, 2023 17:58 13s
July 26, 2023 17:58 13s
Fixes sentries firing turning off their lights Check for merge conflicts #12739: Pull request #4010 synchronize by morrowwolf
July 26, 2023 17:54 13s
July 26, 2023 17:54 13s
Fixes sentries firing turning off their lights Check for merge conflicts #12738: Pull request #4010 opened by morrowwolf
July 26, 2023 17:54 15s
July 26, 2023 17:54 15s
New UPP guns Check for merge conflicts #12737: Pull request #3865 synchronize by CapCamIII
July 26, 2023 17:34 12s
July 26, 2023 17:34 12s
Everyone can see Comms on Minimap now (#3995) Check for merge conflicts #12736: Commit dd9d87f pushed by github-merge-queue bot
July 26, 2023 17:24 4m 15s master
master
July 26, 2023 17:24 4m 15s
Adds a False Testemony charge to Marine Law Check for merge conflicts #12735: Pull request #4009 synchronize by Smov1
July 26, 2023 17:22 2m 16s
July 26, 2023 17:22 2m 16s
Adds a False Testemony charge to Marine Law Check for merge conflicts #12734: Pull request #4009 opened by Smov1
July 26, 2023 17:05 13s
July 26, 2023 17:05 13s
updating MP and warden vendors. adding handgun case. Check for merge conflicts #12733: Pull request #4007 synchronize by Huffie56
July 26, 2023 16:33 13s
July 26, 2023 16:33 13s
ARES Security Log Fix Check for merge conflicts #12732: Pull request #3997 synchronize by realforest2001
July 26, 2023 16:20 1m 42s
July 26, 2023 16:20 1m 42s
Minor tent fix Check for merge conflicts #12731: Pull request #4002 synchronize by ghostsheet
July 26, 2023 16:15 35s
July 26, 2023 16:15 35s
Reworks facehugged effects to make it harder to ignore Check for merge conflicts #12730: Pull request #3843 synchronize by zzzmike
July 26, 2023 16:14 12s
July 26, 2023 16:14 12s
Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #12729: Pull request #4003 synchronize by Zonespace27
July 26, 2023 15:54 11s
July 26, 2023 15:54 11s
Speech problems works for Megaphones now Check for merge conflicts #12728: Pull request #4008 opened by Ben10083
July 26, 2023 15:20 16s
July 26, 2023 15:20 16s
updating MP and warden vendors. adding handgun case. Check for merge conflicts #12727: Pull request #4007 opened by Huffie56
July 26, 2023 14:17 35s
July 26, 2023 14:17 35s
Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #12726: Pull request #4003 synchronize by Zonespace27
July 26, 2023 14:13 2m 28s
July 26, 2023 14:13 2m 28s
Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #12725: Pull request #4003 synchronize by Zonespace27
July 26, 2023 14:09 14s
July 26, 2023 14:09 14s
Updates Yautja Plasma Rifle Check for merge conflicts #12724: Pull request #3942 ready_for_review by Steelpoint
July 26, 2023 14:07 1m 28s
July 26, 2023 14:07 1m 28s
Updates Yautja Plasma Rifle Check for merge conflicts #12723: Pull request #3942 synchronize by Steelpoint
July 26, 2023 14:07 13s
July 26, 2023 14:07 13s
Gun bugfixes Check for merge conflicts #12722: Pull request #4006 ready_for_review by ghostsheet
July 26, 2023 13:57 10s
July 26, 2023 13:57 10s
Gun bugfixes Check for merge conflicts #12721: Pull request #4006 synchronize by ghostsheet
July 26, 2023 13:57 11s
July 26, 2023 13:57 11s
Gun bugfixes Check for merge conflicts #12720: Pull request #4006 opened by ghostsheet
July 26, 2023 13:50 12s
July 26, 2023 13:50 12s
Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #12719: Pull request #4003 synchronize by Zonespace27
July 26, 2023 13:48 12s
July 26, 2023 13:48 12s
Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #12718: Pull request #4003 synchronize by Zonespace27
July 26, 2023 13:41 23s
July 26, 2023 13:41 23s