Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
646 workflow run results
646 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Lower dropship equipment costs (#4001) Check for merge conflicts #12761: Commit 87b829f pushed by github-merge-queue bot
July 27, 2023 12:08 4m 18s master
master
July 27, 2023 12:08 4m 18s
Minor tent fix (#4002) Check for merge conflicts #12760: Commit 1f83efe pushed by github-merge-queue bot
July 27, 2023 11:57 2m 12s master
master
July 27, 2023 11:57 2m 12s
updating MP and warden vendors. adding handgun case. Check for merge conflicts #12759: Pull request #4007 synchronize by Huffie56
July 27, 2023 11:53 13s
July 27, 2023 11:53 13s
Lower dropship equipment costs Check for merge conflicts #12758: Pull request #4001 ready_for_review by GoldenDarkness55
July 27, 2023 11:44 3m 28s
July 27, 2023 11:44 3m 28s
Reworks facehugged effects to make it harder to ignore (#3843) Check for merge conflicts #12757: Commit e455f44 pushed by github-merge-queue bot
July 27, 2023 11:43 2m 12s master
master
July 27, 2023 11:43 2m 12s
Lower dropship equipment costs Check for merge conflicts #12756: Pull request #4001 synchronize by GoldenDarkness55
July 27, 2023 11:43 11s
July 27, 2023 11:43 11s
Speech problems works for Megaphones now (#4008) Check for merge conflicts #12755: Commit 271a3c4 pushed by github-merge-queue bot
July 27, 2023 11:27 4m 16s master
master
July 27, 2023 11:27 4m 16s
Shaking removes stuns faster Check for merge conflicts #12754: Pull request #4019 opened by GoldenDarkness55
July 27, 2023 03:08 15s
July 27, 2023 03:08 15s
Xenos can eat food to regain health (lore accurate) Check for merge conflicts #12753: Pull request #4018 synchronize by ihatethisengine
July 27, 2023 03:05 14s
July 27, 2023 03:05 14s
Xenos can eat food to regain health (lore accurate) Check for merge conflicts #12752: Pull request #4018 opened by ihatethisengine
July 27, 2023 02:48 50s
July 27, 2023 02:48 50s
Player controlled facehuggers no longer have a shortened stun duration Check for merge conflicts #12751: Pull request #4017 opened by GoldenDarkness55
July 27, 2023 02:46 2m 16s
July 27, 2023 02:46 2m 16s
Eggsac no longer able to plant eggs outside hive weeds Check for merge conflicts #12750: Pull request #4015 opened by GoldenDarkness55
July 27, 2023 00:21 12s
July 27, 2023 00:21 12s
ARES Security Log Fix (#3997) Check for merge conflicts #12749: Commit 7252fe5 pushed by github-merge-queue bot
July 26, 2023 23:45 4m 45s master
master
July 26, 2023 23:45 4m 45s
Replaces heavy revolver knockback with screenshake Check for merge conflicts #12748: Pull request #4014 synchronize by GoldenDarkness55
July 26, 2023 23:42 1m 59s
July 26, 2023 23:42 1m 59s
Replaces heavy revolver knockback with screenshake Check for merge conflicts #12747: Pull request #4014 opened by GoldenDarkness55
July 26, 2023 23:40 12s
July 26, 2023 23:40 12s
Welder chestrig Check for merge conflicts #12746: Pull request #3984 synchronize by Dorodomki
July 26, 2023 23:36 13s
July 26, 2023 23:36 13s
Matches dodge chance to previous value Check for merge conflicts #12745: Pull request #4004 synchronize by Katskan
July 26, 2023 21:59 15s
July 26, 2023 21:59 15s
updating MP and warden vendors. adding handgun case. Check for merge conflicts #12744: Pull request #4007 ready_for_review by Huffie56
July 26, 2023 20:29 12s
July 26, 2023 20:29 12s
Shovels can now be used to collapse tunnels Check for merge conflicts #12743: Pull request #4013 opened by morrowwolf
July 26, 2023 19:30 15s
July 26, 2023 19:30 15s
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